Mercurial > hg > mercurial-crew-with-dirclash
graph
-
improve error message for 'hg merge' when repo already at branchtipSat, 25 Aug 2007 11:30:11 +0200, by Benoit Boissinot
-
imerge: add automerge flag to attempt to batch merge all conflictsThu, 23 Aug 2007 22:45:41 -0700, by Brendan Cully
-
Merge with crewThu, 23 Aug 2007 19:52:15 -0700, by Brendan Cully
-
imerge: fix ancestor calculationThu, 23 Aug 2007 19:51:59 -0700, by Brendan Cully