Mercurial > hg

diff tests/test-extdiff @ 3751:797c6e70092b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't require a diff which accepts the -N option.
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 01 Dec 2006 22:29:47 +0100
parents 49966b5ab16f
children 2be225ea5722
line wrap: on
line diff
--- a/tests/test-extdiff	Fri Dec 01 22:09:05 2006 +0100
+++ b/tests/test-extdiff	Fri Dec 01 22:29:47 2006 +0100
@@ -7,11 +7,7 @@
 cd a
 echo a > a
 hg add
-diff -N /dev/null /dev/null 2> /dev/null
-if [ $? -ne 0 ]; then
-	opt="-p gdiff"
-fi
-hg extdiff -o -Nr $opt
+hg extdiff -o -r $opt
 
 echo "[extdiff]" >> $HGRCPATH
 echo "cmd.falabala=echo" >> $HGRCPATH