log mercurial/merge.py @ 3320:b16456909a0a

age author description
Tue, 10 Oct 2006 02:15:20 -0500 Matt Mackall merge: various tidying
Tue, 10 Oct 2006 01:43:58 -0500 Matt Mackall merge: use contexts in checkunknown and forgetremoved
Tue, 10 Oct 2006 01:16:06 -0500 Matt Mackall merge: shortcircuit filemerge for identical files