Mercurial > hg > easyhg
annotate 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 |
| 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 |