Mercurial > hg > easyhg
view easyhg-merge-osx.sh @ 237:c9a7e4ec2f78
* Try to do the right thing when completely reverting a merge (forget that the merge took place)
* When trying to clone from remote repo to existing local dir, offer to create a subdir instead
* Tidy up clone-successful notification
* Add a note to commit and revert confirmation dialogs to tell user if they are committing/reverting only a subset of available files
author | Chris Cannam |
---|---|
date | Mon, 10 Jan 2011 12:44:03 +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"