view easyhg-merge-osx.sh @ 250:be483734bde5

* Make it possible for changeset items to take two or three lines of description, depending on how much there is
 * Some  other small improvements to how changeset items are drawn (e.g. give them opaque white backgrounds)

#!/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"