log mercurial/merge.py @ 2999:fa9c769fee8a

age author description
Tue, 22 Aug 2006 16:12:54 -0500 Matt Mackall merge: minor simplification
Mon, 21 Aug 2006 14:25:56 -0500 Matt Mackall merge: rename mysterious variable
Mon, 21 Aug 2006 14:21:42 -0500 Matt Mackall merge: add backwards variable