log mercurial/merge.py @ 3570:c141d07198b9

age author description
Tue, 17 Oct 2006 22:59:01 -0500 Matt Mackall merge: fix branch setting