Mercurial > hg > easyhg
view easyhg-merge-osx.sh @ 228:b286f26561c9
* Restore a change that got lost in the merge. I think I need to review the external merge tool mechanism here
author | Chris Cannam |
---|---|
date | Thu, 06 Jan 2011 12:22:56 +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"