Mercurial > hg > easyhg
comparison easyhg-merge.sh @ 307:5b4aa1c24407 new-branches-with-status-outside-tabs
Merge branch status_outside_tabs into branch new-branches, and make a new branch
author | Chris Cannam |
---|---|
date | Mon, 28 Feb 2011 13:09:37 +0000 |
parents | a1c8630a0057 |
children | ea62eb083ed4 |
comparison
equal
deleted
inserted
replaced
278:f7cdd5b31aed | 307:5b4aa1c24407 |
---|---|
16 for d in kdiff3 kdiff3.exe; do | 16 for d in kdiff3 kdiff3.exe; do |
17 if [ -x "$p/$d" ]; then | 17 if [ -x "$p/$d" ]; then |
18 found=true | 18 found=true |
19 "$p/$d" "$ancestor" "$left" "$right" -o "$out" | 19 "$p/$d" "$ancestor" "$left" "$right" -o "$out" |
20 break | 20 break |
21 elif [ -x "$(type -path $d)" ]; then | |
22 found=true | |
23 "$d" "$ancestor" "$left" "$right" -o "$out" | |
24 break; | |
21 fi | 25 fi |
22 done | 26 done |
23 if [ -z "$found" ]; then | 27 if [ -z "$found" ]; then |
24 fm=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge | 28 fm=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge |
25 if [ -x "$fm" ]; then | 29 if [ -x "$fm" ]; then |
30 found=true | |
26 "$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right" | 31 "$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right" |
27 fi | 32 fi |
28 fi | 33 fi |
34 [ -n "$found" ] |