Mercurial > hg > easyhg
log easyhg-merge.sh @ 274:24820581e532
age | author | description |
---|---|---|
Thu, 10 Feb 2011 18:49:01 +0000 | Chris Cannam | * Use kdiff3 from path if present; return sensible return code |
Thu, 20 Jan 2011 13:37:00 +0000 | Chris Cannam | * Rename the -osx.sh files to plain .sh, since we could use them elsewhere too. Rely on bundled kdiff3 if it exists. base easyhg-merge-osx.sh@483db46bf40e |