# HG changeset patch
# User Brendan Cully <brendan@kublai.com>
# Date 1165010087 28800
# Node ID 5342d5ae565d85ff58666bd98c3a0f1473cd077b
# Parent  f902f409cd81ed41fe3f3d080ea4c758e87fe847# Parent  797c6e70092bdddd9fe079a2602ec6cd35735d89
Merge with crew

diff --git a/tests/test-extdiff b/tests/test-extdiff
--- a/tests/test-extdiff
+++ b/tests/test-extdiff
@@ -7,11 +7,7 @@ hg init a
 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
diff --git a/tests/test-extdiff.out b/tests/test-extdiff.out
--- a/tests/test-extdiff.out
+++ b/tests/test-extdiff.out
@@ -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
diff --git a/tests/test-symlinks b/tests/test-symlinks
--- a/tests/test-symlinks
+++ b/tests/test-symlinks
@@ -35,7 +35,7 @@ rm a.c
 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