Mercurial > hg > mercurial-crew-with-dirclash
log mercurial/merge.py @ 3108:3bd05ad67f45
age | author | description |
---|---|---|
Sun, 17 Sep 2006 16:47:33 -0500 | Matt Mackall | merge: pull manifest checks and updates into separate functions |
Sun, 17 Sep 2006 16:13:34 -0500 | Matt Mackall | merge: remove now unused umap dict |