Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 2841:619f1c65384c
age | author | description |
---|---|---|
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 |
Tue, 08 Aug 2006 09:19:20 -0500 | Matt Mackall | Refactor update locking slightly |
Tue, 08 Aug 2006 09:11:16 -0500 | Matt Mackall | Merge: combine choose and moddirstate to partial |
Mon, 07 Aug 2006 23:53:04 -0500 | Matt Mackall | Rename merge.allow -> merge.branchmerge |