Mercurial > hg > easyhg

diff easyhg-merge.sh @ 274:24820581e532

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* Use kdiff3 from path if present; return sensible return code
author Chris Cannam
date Thu, 10 Feb 2011 18:49:01 +0000
parents f6b71fda5957
children a1c8630a0057
line wrap: on
line diff
--- a/easyhg-merge.sh	Tue Jan 25 16:41:40 2011 +0000
+++ b/easyhg-merge.sh	Thu Feb 10 18:49:01 2011 +0000
@@ -18,6 +18,10 @@
 	found=true
 	"$p/$d" "$ancestor" "$left" "$right" -o "$out"
 	break
+    elif [ -x "$(type -path $d)" ]; then
+	found=true
+	"$d" "$ancestor" "$left" "$right" -o "$out"
+	break;
     fi
 done
 if [ -z "$found" ]; then
@@ -26,3 +30,4 @@
 	"$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right"
     fi
 fi
+[ -z "$found" ]