Mercurial > hg > easyhg

changeset 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 71523ce87fb7
children 0714a86b8077
files easyhg-extdiff.sh easyhg-merge.sh
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- 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
--- 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)"