Mercurial > hg > easyhg

diff easyhg-merge.sh @ 469:d63711ff6740

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Look for easyhg-kdiff3 in preference to plain kdiff3
author Chris Cannam
date Thu, 07 Jul 2011 10:59:50 +0100
parents d2e4bf428cfc
children 5f04fa848f34
line wrap: on
line diff
--- a/easyhg-merge.sh	Mon Jul 04 14:22:13 2011 +0100
+++ b/easyhg-merge.sh	Thu Jul 07 10:59:50 2011 +0100
@@ -12,7 +12,7 @@
 left="$1"
 ancestor="$2"
 right="$3"
-for d in kdiff3 kdiff3.exe; do
+for d in easyhg-kdiff3 easyhg-kdiff3.exe kdiff3 kdiff3.exe; do
     exe="$p/$d"
     if [ ! -x "$exe" ]; then
 	exe="$(type -path $d)"