Mercurial > hg
graph
-
change tests to use simplemerge by defaultMon, 16 Apr 2007 20:17:39 -0300, by Alexis S. L. Carvalho
-
polish the simplemerge command; add a testMon, 16 Apr 2007 20:17:39 -0300, by Alexis S. L. Carvalho
-
actually port simplemerge to hgMon, 16 Apr 2007 20:17:39 -0300, by Alexis S. L. Carvalho
-
Import 3-way merge code from bzrMon, 16 Apr 2007 20:17:39 -0300, by Alexis S. L. Carvalho