log mercurial/merge.py @ 3107:4ec28446fca8

age author description
Sun, 17 Sep 2006 16:13:34 -0500 Matt Mackall merge: remove now unused umap dict