Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 2827:56f99f5aab34
age | author | description |
---|---|---|
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 |