log mercurial/merge.py @ 3106:7c7469d41ade

age author description
Sun, 17 Sep 2006 16:13:03 -0500 Matt Mackall merge: pull manifest comparison out into separate function