# HG changeset patch
# User Chris Cannam
# Date 1298312175 0
# Node ID a1c8630a00572f7bc6be36ec0be9228d20deb18f
# Parent  37f67999b661ae3d3d827d0a68c19ff2e0a8ce44
Return success if the external diff/merge _is_ found, not if it isn't!

diff -r 37f67999b661 -r a1c8630a0057 easyhg-extdiff.sh
--- a/easyhg-extdiff.sh	Mon Feb 21 12:15:04 2011 +0000
+++ b/easyhg-extdiff.sh	Mon Feb 21 18:16:15 2011 +0000
@@ -26,5 +26,5 @@
 	"$od" "$1" "$2" | cat
     fi
 fi
-[ -z "$found" ]
+[ -n "$found" ]
 
diff -r 37f67999b661 -r a1c8630a0057 easyhg-merge.sh
--- a/easyhg-merge.sh	Mon Feb 21 12:15:04 2011 +0000
+++ b/easyhg-merge.sh	Mon Feb 21 18:16:15 2011 +0000
@@ -27,7 +27,8 @@
 if [ -z "$found" ]; then
     fm=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
     if [ -x "$fm" ]; then
+	found=true
 	"$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right"
     fi
 fi
-[ -z "$found" ]
+[ -n "$found" ]