Mercurial > hg > easyhg
comparison easyhg-merge.sh @ 336:4229b6a8e9c6
Merge
author | Chris Cannam |
---|---|
date | Mon, 14 Mar 2011 10:00:29 +0000 |
parents | ea62eb083ed4 |
children | d2e4bf428cfc |
comparison
equal
deleted
inserted
replaced
335:aa852b477e4d | 336:4229b6a8e9c6 |
---|---|
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 found="" | |
16 for d in kdiff3 kdiff3.exe; do | 15 for d in kdiff3 kdiff3.exe; do |
17 if [ -x "$p/$d" ]; then | 16 if [ -x "$p/$d" ]; then |
18 found=true | 17 exec "$p/$d" "$ancestor" "$left" "$right" -o "$out" |
19 "$p/$d" "$ancestor" "$left" "$right" -o "$out" | |
20 break | |
21 elif [ -x "$(type -path $d)" ]; then | 18 elif [ -x "$(type -path $d)" ]; then |
22 found=true | 19 exec "$d" "$ancestor" "$left" "$right" -o "$out" |
23 "$d" "$ancestor" "$left" "$right" -o "$out" | |
24 break; | |
25 fi | 20 fi |
26 done | 21 done |
27 if [ -z "$found" ]; then | 22 fm=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge |
28 fm=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge | 23 if [ -x "$fm" ]; then |
29 if [ -x "$fm" ]; then | 24 exec "$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right" |
30 found=true | |
31 "$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right" | |
32 fi | |
33 fi | 25 fi |
34 [ -n "$found" ] | 26 exit 1 |