log mercurial/merge.py @ 3774:b1eeaeb936ae

age author description
Sun, 03 Dec 2006 16:16:33 -0600 Matt Mackall Handle transcoding of branch names
Thu, 30 Nov 2006 17:36:33 -0600 Matt Mackall merge: handle directory renames
Thu, 30 Nov 2006 17:36:33 -0600 Matt Mackall merge: pull findcopies helpers inside, refactor checkpair to checkcopies