annotate easyhg-merge-osx.sh @ 215:43ecb0dcc44e

* OS/X: Add icon (not sure this is working though) * Merge script, etc
author Chris Cannam
date Wed, 05 Jan 2011 15:58:34 +0000
parents
children
rev   line source
Chris@215 1 #!/bin/bash
Chris@215 2 echo Args are: $@ 1>&2
Chris@215 3 if [ "$#" -lt 3 ]; then
Chris@215 4 echo Insufficient arguments: $@
Chris@215 5 exit 2
Chris@215 6 fi
Chris@215 7 while [ "$#" -gt 3 ]; do
Chris@215 8 shift
Chris@215 9 done
Chris@215 10 /Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge \
Chris@215 11 -left "$1" -merge "$1" -ancestor "$2" -right "$3"
Chris@215 12