log mercurial/merge.py @ 3317:966632304dde

age author description
Tue, 10 Oct 2006 01:16:06 -0500 Matt Mackall merge: shortcircuit filemerge for identical files