Mercurial > hg > mercurial-crew-with-dirclash

log contrib/simplemerge @ 4360:d5c3a70f8422

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho polish the simplemerge command; add a test
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho actually port simplemerge to hg
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho Import 3-way merge code from bzr
less more | (0) tip