Mercurial > hg > easyhg

comparison easyhg-merge.sh @ 296:d40294e164da status_outside_tabs

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from the default branch
author Chris Cannam
date Tue, 22 Feb 2011 13:03:03 +0000
parents a1c8630a0057
children ea62eb083ed4
comparison
equal deleted inserted replaced
287:3fbafca196e4 296:d40294e164da
25 fi 25 fi
26 done 26 done
27 if [ -z "$found" ]; then 27 if [ -z "$found" ]; then
28 fm=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge 28 fm=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
29 if [ -x "$fm" ]; then 29 if [ -x "$fm" ]; then
30 found=true
30 "$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right" 31 "$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right"
31 fi 32 fi
32 fi 33 fi
33 [ -z "$found" ] 34 [ -n "$found" ]