log mercurial/merge.py @ 4354:8aee687f0214

age author description
Mon, 16 Apr 2007 12:24:52 -0500 Matt Mackall merge: fix quadratic behavior in find-copies
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
Fri, 16 Mar 2007 00:45:18 -0300 Alexis S. L. Carvalho Merge with crew-stable
Wed, 14 Mar 2007 01:26:09 -0500 Matt Mackall Merge with -stable, fix small test failure
Tue, 13 Mar 2007 18:50:02 -0500 Matt Mackall Move branch read/write to dirstate where it belongs