On Sat, 2 Oct 2004 08:55:01 -0400, Steve Elgersma <elgersma(a)gmail.com> wrote:
Are you, by any chance, running the web server/PHP on
a Solaris
platform? I'm noticing the same behaviour, but only on Solaris:
Linux-based installs do the right thing. I just submitted a bug
report yesterday (#619). Seems odd that it would be OS-based, but
unless I've missed something blindingly obvious...
Well, since the code merging uses an external facility (diff3) this
could easily vary between OSes. My suspicion is that the command-line
arguments aren't the same. I've added a comment to
http://bugzilla.wikipedia.org/619
--
Rowan Collins BSc
[IMSoP]