diff easyhg-merge.sh @ 269:f6b71fda5957

* Rename the -osx.sh files to plain .sh, since we could use them elsewhere too.  Rely on bundled kdiff3 if it exists.

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/easyhg-merge.sh	Thu Jan 20 13:37:00 2011 +0000
@@ -0,0 +1,28 @@
+#!/bin/bash
+p=`dirname $0`
+echo Args are: $@ 1>&2
+if [ "$#" -lt 3 ]; then
+	echo Insufficient arguments: $@
+	exit 2
+fi
+while [ "$#" -gt 3 ]; do
+	shift
+done
+out="$1"
+left="$1"
+ancestor="$2"
+right="$3"
+found=""
+for d in kdiff3 kdiff3.exe; do
+    if [ -x "$p/$d" ]; then
+	found=true
+	"$p/$d" "$ancestor" "$left" "$right" -o "$out"
+	break
+    fi
+done
+if [ -z "$found" ]; then
+    fm=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
+    if [ -x "$fm" ]; then
+	"$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right"
+    fi
+fi