Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 2850:b11c014dcbd9
age | author | description |
---|---|---|
Wed, 09 Aug 2006 22:07:13 -0500 | Matt Mackall | Merge: use single objects for tracking manifests |
Wed, 09 Aug 2006 17:11:01 -0500 | Matt Mackall | Merge: save away mode bit so that we don't need manifest later |
Wed, 09 Aug 2006 15:03:46 -0500 | Matt Mackall | Merge manifest refactor work |
Tue, 08 Aug 2006 10:56:48 -0500 | Matt Mackall | Merge: combine force and forcemerge arguments |
Tue, 08 Aug 2006 10:35:19 -0500 | Matt Mackall | Merge: move most tests to the beginning |
Tue, 08 Aug 2006 09:26:00 -0500 | Matt Mackall | Merge: refactor err and failedmerge -> unresolved |