Mercurial > hg > easyhg
comparison easyhg-extdiff.sh @ 469:d63711ff6740
Look for easyhg-kdiff3 in preference to plain kdiff3
author | Chris Cannam |
---|---|
date | Thu, 07 Jul 2011 10:59:50 +0100 |
parents | ea62eb083ed4 |
children |
comparison
equal
deleted
inserted
replaced
468:71523ce87fb7 | 469:d63711ff6740 |
---|---|
5 exit 2 | 5 exit 2 |
6 fi | 6 fi |
7 while [ $# -gt 2 ]; do | 7 while [ $# -gt 2 ]; do |
8 shift | 8 shift |
9 done | 9 done |
10 for d in kdiff3 kdiff3.exe; do | 10 for d in easyhg-kdiff3 easyhg-kdiff3.exe kdiff3 kdiff3.exe; do |
11 if [ -x "$p/$d" ]; then | 11 if [ -x "$p/$d" ]; then |
12 exec "$p/$d" "$1" "$2" | 12 exec "$p/$d" "$1" "$2" |
13 elif [ -x "$(type -path $d)" ]; then | 13 elif [ -x "$(type -path $d)" ]; then |
14 exec "$d" "$1" "$2" | 14 exec "$d" "$1" "$2" |
15 fi | 15 fi |