Mercurial > hg > easyhg

diff easyhg-merge.sh @ 292:a1c8630a0057

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Return success if the external diff/merge _is_ found, not if it isn't!
author Chris Cannam
date Mon, 21 Feb 2011 18:16:15 +0000
parents 24820581e532
children ea62eb083ed4
line wrap: on
line diff
--- 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" ]