--- a/tests/test-bisect	Fri Aug 18 10:05:44 2006 -0700
+++ b/tests/test-bisect	Fri Aug 18 10:24:04 2006 -0700
@@ -17,7 +17,7 @@
     test $count -eq 0 && hg add
     hg ci -m "msg $count" -d "$count 0"
     echo % committed changeset $count
-    count=$(( $count + 1 ))
+    count=`expr $count + 1`
 done
 
 echo % log

--- a/tests/test-extdiff	Fri Aug 18 10:05:44 2006 -0700
+++ b/tests/test-extdiff	Fri Aug 18 10:24:04 2006 -0700
@@ -8,7 +8,11 @@
 cd a
 echo a > a
 hg add
-hg extdiff -o -Nr
+diff -N /dev/null /dev/null 2> /dev/null
+if [ $? -ne 0 ]; then
+	opt="-p gdiff"
+fi
+hg extdiff -o -Nr $opt
 
 echo "[extdiff]" >> $HGTMP/.hgrc
 echo "cmd.falabala=echo" >> $HGTMP/.hgrc