Mercurial > hg > easyhg

comparison easyhg-merge.sh @ 292:a1c8630a0057

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Return success if the external diff/merge _is_ found, not if it isn't!
author Chris Cannam
date Mon, 21 Feb 2011 18:16:15 +0000
parents 24820581e532
children ea62eb083ed4
comparison
equal deleted inserted replaced
289:37f67999b661 292:a1c8630a0057
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" ]