# HG changeset patch
# User Chris Cannam
# Date 1310032790 -3600
# Node ID d63711ff6740425c0d48b568636cde96dcebd03b
# Parent  71523ce87fb71ade2239e4f25240fdfb45372436
Look for easyhg-kdiff3 in preference to plain kdiff3

diff -r 71523ce87fb7 -r d63711ff6740 easyhg-extdiff.sh
--- a/easyhg-extdiff.sh	Mon Jul 04 14:22:13 2011 +0100
+++ b/easyhg-extdiff.sh	Thu Jul 07 10:59:50 2011 +0100
@@ -7,7 +7,7 @@
 while [ $# -gt 2 ]; do
     shift
 done
-for d in kdiff3 kdiff3.exe; do
+for d in easyhg-kdiff3 easyhg-kdiff3.exe kdiff3 kdiff3.exe; do
     if [ -x "$p/$d" ]; then
 	exec "$p/$d" "$1" "$2"
     elif [ -x "$(type -path $d)" ]; then
diff -r 71523ce87fb7 -r d63711ff6740 easyhg-merge.sh
--- 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)"