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
Tue, 15 Aug 2006 23:17:06 -0500 Matt Mackall merge: consolidate dirstate updates
Tue, 15 Aug 2006 22:46:35 -0500 Matt Mackall merge: use file size stored in revlog index
Tue, 15 Aug 2006 18:30:21 -0500 Matt Mackall merge: move forgets to the apply stage
Tue, 15 Aug 2006 18:12:36 -0500 Matt Mackall trivial bool() cleanup