Mercurial > hg > easyhg

log easyhg-merge.sh @ 335:aa852b477e4d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Mon, 21 Feb 2011 18:16:15 +0000 Chris Cannam Return success if the external diff/merge _is_ found, not if it isn't!
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
less more | (0) tip