Mercurial > hg
changeset 3751:797c6e70092b
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 | 0f550b87deb8 |
| children | 5342d5ae565d cd25a4a1a265 |
| files | tests/test-extdiff tests/test-extdiff.out |
| diffstat | 2 files changed, 2 insertions(+), 8 deletions(-) [+] |
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
--- 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