Mercurial > hg

log contrib/simplemerge @ 6714:5f339b6a7eff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
less more | (0) tip
age author description
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: move the bulk of simplemerge into core
Tue, 07 Aug 2007 10:24:33 +0200 Thomas Arendsen Hein Remove trailing spaces
Sun, 06 May 2007 16:40:53 +0200 Patrick Mezard simplemerge: flush stdout before writing to stderr.
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