log mercurial/merge.py @ 3280:ae85272b59a4

age author description
Fri, 06 Oct 2006 16:55:11 -0500 Matt Mackall merge: copy fixes and tests
Wed, 04 Oct 2006 19:08:04 -0500 Matt Mackall merge: fixes for merge+rename
Wed, 04 Oct 2006 15:43:27 -0500 Matt Mackall merge: add rename following