Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3006:87a0332ab58b
age | author | description |
---|---|---|
Tue, 22 Aug 2006 18:06:17 -0500 | Matt Mackall | merge: combine merge and get lists |
Tue, 22 Aug 2006 17:42:55 -0500 | Matt Mackall | merge: remove redundant if |
Tue, 22 Aug 2006 17:26:44 -0500 | Matt Mackall | merge: eliminate mw manifestdict, do everything with m1 |
Tue, 22 Aug 2006 17:20:09 -0500 | Matt Mackall | merge: eliminate usage of m1 after working manifest creation |
Tue, 22 Aug 2006 17:08:38 -0500 | Matt Mackall | merge: simplify working dir manifest generation |
Tue, 22 Aug 2006 16:47:27 -0500 | Matt Mackall | merge: simplify some update logic |