Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3096:54d85098fb82
age | author | description |
---|---|---|
Tue, 22 Aug 2006 19:39:54 -0500 | Matt Mackall | merge: make unresolved a counter |
Tue, 22 Aug 2006 19:32:16 -0500 | Matt Mackall | merge: use context code to retrieve manifests |
Sat, 26 Aug 2006 11:19:00 +0200 | Benoit Boissinot | fix errors reported by pychecker |