log mercurial/merge.py @ 3015:db3f42261452

age author description
Sat, 26 Aug 2006 11:19:00 +0200 Benoit Boissinot fix errors reported by pychecker
Tue, 22 Aug 2006 19:12:09 -0500 Matt Mackall merge: add remove to the action hash
Tue, 22 Aug 2006 18:06:17 -0500 Matt Mackall merge: combine merge and get lists
Tue, 22 Aug 2006 17:42:55 -0500 Matt Mackall merge: remove redundant if
Tue, 22 Aug 2006 17:26:44 -0500 Matt Mackall merge: eliminate mw manifestdict, do everything with m1
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