Mercurial > hg > easyhg

comparison easyhg-merge.sh @ 282:1ec306df738e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author Chris Cannam
date Fri, 18 Feb 2011 13:39:16 +0000
parents 24820581e532
children a1c8630a0057
comparison
equal deleted inserted replaced
281:9162f14c5ab7 282:1ec306df738e
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
26 "$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right" 30 "$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right"
27 fi 31 fi
28 fi 32 fi
33 [ -z "$found" ]