log mercurial/merge.py @ 3116:bb74f809bc95

age author description
Sun, 17 Sep 2006 20:00:14 -0500 Matt Mackall merge: reorder tests on m2 items in manifestmerge