Mercurial > hg > easyhg

comparison easyhg-merge.sh @ 536:5f04fa848f34

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add changelog
author Chris Cannam
date Fri, 25 Nov 2011 09:34:55 +0000
parents d63711ff6740
children
comparison
equal deleted inserted replaced
535:6b5da526bcd8 536:5f04fa848f34
19 if [ ! -x "$exe" ]; then 19 if [ ! -x "$exe" ]; then
20 exe="" 20 exe=""
21 fi 21 fi
22 fi 22 fi
23 if [ -n "$exe" ]; then 23 if [ -n "$exe" ]; then
24 exec "$exe" "$ancestor" "$left" "$right" --output "$out" --auto -L1 "`basename $left` (Common ancestor)" -L2 "$left (Your current version)" -L3 "`basename $left` (Version being merged)" 24 exec "$exe" --auto "$ancestor" "$left" "$right" --output "$out" --auto -L1 "`basename $left` (Common ancestor)" -L2 "$left (Your current version)" -L3 "`basename $left` (Version being merged)"
25 fi 25 fi
26 done 26 done
27 fm=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge 27 fm=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
28 if [ -x "$fm" ]; then 28 if [ -x "$fm" ]; then
29 exec "$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right" 29 exec "$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right"