Mercurial > hg-stable
changeset 1647:64a1169c927d
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 | 8e9c203946ae |
| children | 80640ef93aec |
| files | hgmerge |
| diffstat | 1 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/hgmerge Sun Jan 29 09:10:13 2006 +1300 +++ b/hgmerge Sun Jan 29 10:10:00 2006 +1300 @@ -44,6 +44,16 @@ cp "$LOCAL.orig" "$LOCAL" fi +# on MacOS X try opendiff +# (uses FileMerge.app, shipped with Apple's developer tools) +if type opendiff > /dev/null 2>&1; then + opendiff "$LOCAL.orig" "$OTHER" -ancestor "$BASE" -merge "$LOCAL" || exit 1 + # prevent $OTHER from being removed too early + # can surely be done in a more elegant way + sleep 1 + exit 0 +fi + if [ -n "$DISPLAY" ]; then # try using kdiff3, which is fairly nice if type kdiff3 > /dev/null 2>&1; then