Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-extdiff @ 2932:d77022db1bca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Solaris portability fixes
author Danek Duvall <danek.duvall@sun.com>
date Fri, 18 Aug 2006 10:24:04 -0700
parents 8fd6925ae32f
children 61fcd9fac434
line wrap: on
line diff
--- a/tests/test-extdiff
+++ b/tests/test-extdiff
@@ -8,7 +8,11 @@ hg init a
 cd a
 echo a > a
 hg add
-hg extdiff -o -Nr
+diff -N /dev/null /dev/null 2> /dev/null
+if [ $? -ne 0 ]; then
+	opt="-p gdiff"
+fi
+hg extdiff -o -Nr $opt
 
 echo "[extdiff]" >> $HGTMP/.hgrc
 echo "cmd.falabala=echo" >> $HGTMP/.hgrc