Mercurial > hg > easyhg
diff easyhg-merge.sh @ 379:d2e4bf428cfc
Try to make kdiff3 a bit clearer
author | Chris Cannam |
---|---|
date | Wed, 13 Apr 2011 17:09:57 +0100 |
parents | ea62eb083ed4 |
children | d63711ff6740 |
line wrap: on
line diff
--- a/easyhg-merge.sh Tue Apr 12 12:21:51 2011 +0100 +++ b/easyhg-merge.sh Wed Apr 13 17:09:57 2011 +0100 @@ -13,10 +13,15 @@ ancestor="$2" right="$3" for d in kdiff3 kdiff3.exe; do - if [ -x "$p/$d" ]; then - exec "$p/$d" "$ancestor" "$left" "$right" -o "$out" - elif [ -x "$(type -path $d)" ]; then - exec "$d" "$ancestor" "$left" "$right" -o "$out" + exe="$p/$d" + if [ ! -x "$exe" ]; then + exe="$(type -path $d)" + if [ ! -x "$exe" ]; then + exe="" + fi + fi + if [ -n "$exe" ]; then + exec "$exe" "$ancestor" "$left" "$right" --output "$out" --auto -L1 "`basename $left` (Common ancestor)" -L2 "$left (Your current version)" -L3 "`basename $left` (Version being merged)" fi done fm=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge