Mercurial > hg > mercurial-crew-with-dirclash

log hgmerge @ 1434:696851b1bba9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) -10 -6 tip
age author description
Mon, 24 Oct 2005 14:55:53 -0700 levon Fix use of diff(1) triggered by set -e.
Thu, 04 Aug 2005 13:31:25 -0800 mpm Merge with BOS
Thu, 04 Aug 2005 13:27:41 -0800 mpm Merge with TAH
Thu, 04 Aug 2005 17:43:05 +0100 Thomas Arendsen Hein Cleaned up trap handling:
Thu, 04 Aug 2005 17:23:31 +0100 Thomas Arendsen Hein If rejects are empty after using the editor, merge with diff+patch was ok.
Thu, 04 Aug 2005 17:16:41 +0100 Thomas Arendsen Hein Shortened hgmerge a little bit.
less more | (0) -10 -6 tip