Mercurial > hg-stable

changeset 3753:5342d5ae565d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew
author Brendan Cully <brendan@kublai.com>
date Fri, 01 Dec 2006 13:54:47 -0800
parents f902f409cd81 (current diff) 797c6e70092b (diff)
children 2f2b59fcb394
files
diffstat 3 files changed, 3 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-extdiff	Fri Dec 01 13:50:09 2006 -0800
+++ b/tests/test-extdiff	Fri Dec 01 13:54:47 2006 -0800
@@ -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 13:50:09 2006 -0800
+++ b/tests/test-extdiff.out	Fri Dec 01 13:54:47 2006 -0800
@@ -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
--- a/tests/test-symlinks	Fri Dec 01 13:50:09 2006 -0800
+++ b/tests/test-symlinks	Fri Dec 01 13:54:47 2006 -0800
@@ -35,7 +35,7 @@
 rm dir/a.o
 rm dir/b.o
 mkdir dir/a.o
-ln -sf nonexist dir/b.o
+ln -s nonexist dir/b.o
 mkfifo a.c
 # it should show a.c, dir/a.o and dir/b.o deleted
 hg status