log mercurial/merge.py @ 3003:cbb90f4bafb0

age author description
Tue, 22 Aug 2006 17:20:09 -0500 Matt Mackall merge: eliminate usage of m1 after working manifest creation
Tue, 22 Aug 2006 17:08:38 -0500 Matt Mackall merge: simplify working dir manifest generation
Tue, 22 Aug 2006 16:47:27 -0500 Matt Mackall merge: simplify some update logic
Tue, 22 Aug 2006 16:23:29 -0500 Matt Mackall merge: hoist partial code out of manifest loops
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