Mercurial > hg > easyhg
view easyhg-merge-osx.sh @ 248:011312e59e44
Startup fixes:
* Check that Hg works before open-or-stat, and only open-or-stat if tests successful
* Make multichoicedialog for open always reopen with the same choice as last time (vital when an open action is aborted and user has to enter details again)
* Offer to create full path to target dir for clone if parent doesn't exist
author | Chris Cannam |
---|---|
date | Tue, 11 Jan 2011 13:56:48 +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"