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.
--- a/hgmerge
+++ b/hgmerge
@@ -44,6 +44,16 @@ elif [ -n "$DIFF3" ]; then
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