Lines 1-10
Link Here
|
1 |
--- config/index.php.orig Tue Jun 6 11:04:04 2006 |
1 |
--- config/index.php.orig Sat Oct 14 02:06:36 2006 |
2 |
+++ config/index.php Sat Jul 1 13:27:04 2006 |
2 |
+++ config/index.php Sun Dec 3 16:18:18 2006 |
3 |
@@ -340,7 +340,7 @@ |
3 |
@@ -434,7 +434,7 @@ |
4 |
$diff3locations = array("/usr/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin") + explode($sep, getenv("PATH")); |
4 |
$diff3locations = array( "/usr/bin", "/usr/local/bin", "/opt/csw/bin", "/usr/gnu/bin", "/usr/sfw/bin" ) + explode( $sep, getenv( "PATH" ) ); |
5 |
$diff3names = array("gdiff3", "diff3", "diff3.exe"); |
5 |
$diff3names = array( "gdiff3", "diff3", "diff3.exe" ); |
6 |
|
6 |
|
7 |
-$diff3versioninfo = array('$1 --version 2>&1', 'diff3 (GNU diffutils)'); |
7 |
-$diff3versioninfo = array( '$1 --version 2>&1', 'diff3 (GNU diffutils)' ); |
8 |
+$diff3versioninfo = array('$1 --version 2>&1', 'diff3 - GNU diffutils'); |
8 |
+$diff3versioninfo = array('$1 --version 2>&1', 'diff3 - GNU diffutils'); |
9 |
foreach ($diff3locations as $loc) { |
9 |
foreach ($diff3locations as $loc) { |
10 |
$exe = locate_executable($loc, $diff3names, $diff3versioninfo); |
10 |
$exe = locate_executable($loc, $diff3names, $diff3versioninfo); |