Mercurial > hg > easyhg
view easyhg-merge-osx.sh @ 235:2f4d401ce47c
* Better handling for case where we've just created a new branch but not yet committed it (i.e. no heads are on our current branch)
author | Chris Cannam |
---|---|
date | Fri, 07 Jan 2011 21:58:38 +0000 |
parents | 43ecb0dcc44e |
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"