Mercurial > hg > easyhg
comparison easyhg-merge.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 | d2e4bf428cfc |
| children | 5f04fa848f34 |
comparison
equal
deleted
inserted
replaced
| 468:71523ce87fb7 | 469:d63711ff6740 |
|---|---|
| 10 done | 10 done |
| 11 out="$1" | 11 out="$1" |
| 12 left="$1" | 12 left="$1" |
| 13 ancestor="$2" | 13 ancestor="$2" |
| 14 right="$3" | 14 right="$3" |
| 15 for d in kdiff3 kdiff3.exe; do | 15 for d in easyhg-kdiff3 easyhg-kdiff3.exe kdiff3 kdiff3.exe; do |
| 16 exe="$p/$d" | 16 exe="$p/$d" |
| 17 if [ ! -x "$exe" ]; then | 17 if [ ! -x "$exe" ]; then |
| 18 exe="$(type -path $d)" | 18 exe="$(type -path $d)" |
| 19 if [ ! -x "$exe" ]; then | 19 if [ ! -x "$exe" ]; then |
| 20 exe="" | 20 exe="" |