log mercurial/merge.py @ 3318:c5075ad5e3e9

age author description
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
Tue, 10 Oct 2006 00:54:00 -0500 Matt Mackall merge: pull file copy/move out of filemerge