Mercurial > hg > easyhg

diff easyhg-merge.sh @ 296:d40294e164da status_outside_tabs

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from the default branch
author Chris Cannam
date Tue, 22 Feb 2011 13:03:03 +0000
parents a1c8630a0057
children ea62eb083ed4
line wrap: on
line diff
--- a/easyhg-merge.sh	Mon Feb 21 11:07:21 2011 +0000
+++ b/easyhg-merge.sh	Tue Feb 22 13:03:03 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" ]