(bug 619) be intelligent about finding the "diff3" executable. firstly, make sure
authorRiver Tarnell <kateturner@users.mediawiki.org>
Thu, 30 Jun 2005 08:23:32 +0000 (08:23 +0000)
committerRiver Tarnell <kateturner@users.mediawiki.org>
Thu, 30 Jun 2005 08:23:32 +0000 (08:23 +0000)
commit396a78b3e0f055bfe765fba26f4ec788e53d252f
treee8142dcda68b2e1a0b38a9e74d7fa61422994f5b
parentfa6cd87122f8d6c1228c3a78fe4d81d64804b0a3
(bug 619) be intelligent about finding the "diff3" executable.  firstly, make sure
it's GNU diff3, not an incompatible vendor-supplied one.  secondly, hardcode several
locations where GNU diff3 is likely to be found on at least Solaris and Linux, as
well as searching $PATH for both "diff3" and "gdiff3".
config/index.php