log mercurial/merge.py @ 4400:93652499bed3

age author description
Thu, 03 May 2007 17:24:43 -0500 Matt Mackall merge: simplify a check in checkcopies