Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
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.
authorThomas Arendsen Hein <thomas@intevation.de>
Fri, 01 Dec 2006 22:29:47 +0100
changeset 3751 797c6e70092b
parent 3750 0f550b87deb8
child 3753 5342d5ae565d
child 3754 cd25a4a1a265
Don't require a diff which accepts the -N option.
tests/test-extdiff file | annotate | diff | comparison | revisions
tests/test-extdiff.out file | annotate | diff | comparison | revisions 
--- 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
--- a/tests/test-extdiff.out	Fri Dec 01 22:09:05 2006 +0100
+++ b/tests/test-extdiff.out	Fri Dec 01 22:29:47 2006 +0100
@@ -1,9 +1,7 @@
 adding a
 making snapshot of 0 files from rev 000000000000
 making snapshot of 1 files from working dir
-diff -Nr a.000000000000/a a/a
-0a1
-> a
+Only in a: a
 making snapshot of 0 files from rev 000000000000
 making snapshot of 1 files from working dir
 diffing a.000000000000 a
Mercurial