view easyhg-merge-osx.sh @ 238:e2f2c6e3c01b

* Attempt a different way of handling filesystem updates, that's more forgiving of fs changes caused by hg itself

#!/bin/bash
echo Args are: $@ 1>&2
if [ "$#" -lt 3 ]; then
	echo Insufficient arguments: $@
	exit 2
fi
while [ "$#" -gt 3 ]; do
	shift
done
/Developer/Applications/Utilities/FileMerge.app/Contents/MacOS/FileMerge \
	-left "$1" -merge "$1" -ancestor "$2" -right "$3"