Mercurial > hg > mercurial-crew-with-dirclash

comparison hgmerge @ 1647:64a1169c927d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Use of opendiff as merge program on MacOS X Hello, If one has the developer tools installed on MacOS X there's another alternative for the merge program. Invocation could be done somehow like in the attached patch for hgmerge.
author Christian Ebert <blacktrash@gmx.net>
date Sun, 29 Jan 2006 10:10:00 +1300
parents 696851b1bba9
children 4338e33c973b
comparison
equal deleted inserted replaced
1646:8e9c203946ae 1647:64a1169c927d
40 echo "$DIFF3 failed! Exiting." 1>&2 40 echo "$DIFF3 failed! Exiting." 1>&2
41 cp "$LOCAL.orig" "$LOCAL" 41 cp "$LOCAL.orig" "$LOCAL"
42 exit 1 42 exit 1
43 fi 43 fi
44 cp "$LOCAL.orig" "$LOCAL" 44 cp "$LOCAL.orig" "$LOCAL"
45 fi
46
47 # on MacOS X try opendiff
48 # (uses FileMerge.app, shipped with Apple's developer tools)
49 if type opendiff > /dev/null 2>&1; then
50 opendiff "$LOCAL.orig" "$OTHER" -ancestor "$BASE" -merge "$LOCAL" || exit 1
51 # prevent $OTHER from being removed too early
52 # can surely be done in a more elegant way
53 sleep 1
54 exit 0
45 fi 55 fi
46 56
47 if [ -n "$DISPLAY" ]; then 57 if [ -n "$DISPLAY" ]; then
48 # try using kdiff3, which is fairly nice 58 # try using kdiff3, which is fairly nice
49 if type kdiff3 > /dev/null 2>&1; then 59 if type kdiff3 > /dev/null 2>&1; then