log mercurial/merge.py @ 4312:5e05007d3857

age author description
Thu, 05 Apr 2007 17:09:31 -0500 Matt Mackall Merge with stable
Thu, 05 Apr 2007 16:43:18 -0500 Matt Mackall merge: fix a bug where copies were ignored
Thu, 05 Apr 2007 16:25:47 -0500 Matt Mackall merge: fix a bug where copies were getting ignored