log mercurial/merge.py @ 2998:833677bc9791

age author description
Mon, 21 Aug 2006 14:25:56 -0500 Matt Mackall merge: rename mysterious variable