Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3255:f05c182430a0
age | author | description |
---|---|---|
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 |
Wed, 04 Oct 2006 14:09:26 -0500 | Matt Mackall | merge: reorder dirstate update slightly for correctness |
Tue, 03 Oct 2006 01:21:46 -0500 | Matt Mackall | merge: use new working context object in update |
Mon, 02 Oct 2006 12:06:33 -0500 | Matt Mackall | merge: remove old merge function |
Mon, 02 Oct 2006 12:04:48 -0500 | Matt Mackall | merge: extend file merge function for renames |