# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1138482600 -46800
# Node ID 64a1169c927d26d15ed085560ba921e36d4c5cd1
# Parent  8e9c203946ae02b3df9623bd2322344d8623f31a
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.



diff -r 8e9c203946ae -r 64a1169c927d hgmerge
--- 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