log mercurial/merge.py @ 2997:545d33aa3f82

age author description
Mon, 21 Aug 2006 14:21:42 -0500 Matt Mackall merge: add backwards variable