annotate 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.
author Chris Cannam
date Thu, 20 Jan 2011 13:37:00 +0000
parents easyhg-merge-osx.sh@43ecb0dcc44e
children 24820581e532
rev   line source
Chris@215 1 #!/bin/bash
Chris@269 2 p=`dirname $0`
Chris@215 3 echo Args are: $@ 1>&2
Chris@215 4 if [ "$#" -lt 3 ]; then
Chris@215 5 echo Insufficient arguments: $@
Chris@215 6 exit 2
Chris@215 7 fi
Chris@215 8 while [ "$#" -gt 3 ]; do
Chris@215 9 shift
Chris@215 10 done
Chris@269 11 out="$1"
Chris@269 12 left="$1"
Chris@269 13 ancestor="$2"
Chris@269 14 right="$3"
Chris@269 15 found=""
Chris@269 16 for d in kdiff3 kdiff3.exe; do
Chris@269 17 if [ -x "$p/$d" ]; then
Chris@269 18 found=true
Chris@269 19 "$p/$d" "$ancestor" "$left" "$right" -o "$out"
Chris@269 20 break
Chris@269 21 fi
Chris@269 22 done
Chris@269 23 if [ -z "$found" ]; then
Chris@269 24 fm=/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge
Chris@269 25 if [ -x "$fm" ]; then
Chris@269 26 "$fm" -left "$left" -merge "$out" -ancestor "$ancestor" -right "$right"
Chris@269 27 fi
Chris@269 28 fi