log mercurial/merge.py @ 4309:09c5f734ff6a

age author description
Thu, 05 Apr 2007 16:25:47 -0500 Matt Mackall merge: fix a bug where copies were getting ignored