Mercurial > hg > easyhg

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* 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
line wrap: on
line source
#!/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"