Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3301:72d1e521da77
age | author | description |
---|---|---|
Mon, 09 Oct 2006 16:07:19 -0500 | Matt Mackall | merge: use contexts for manifestmerge |
Sun, 08 Oct 2006 19:57:45 -0500 | Matt Mackall | merge: remember rename copies and parents properly on commit |
Fri, 06 Oct 2006 16:55:11 -0500 | Matt Mackall | merge: copy fixes and tests |
Wed, 04 Oct 2006 19:08:04 -0500 | Matt Mackall | merge: fixes for merge+rename |
Wed, 04 Oct 2006 15:43:27 -0500 | Matt Mackall | merge: add rename following |
Wed, 04 Oct 2006 14:33:22 -0500 | Matt Mackall | merge: reduce manifest copying |