log tests/test-merge9.out @ 7468:3e5db4228f8f

age author description
Fri, 11 Apr 2008 12:52:56 -0500 Matt Mackall resolve: new command
Thu, 10 Apr 2008 15:02:24 -0500 Matt Mackall merge: introduce mergestate
Fri, 21 Mar 2008 11:06:02 +0100 Dirkjan Ochtman warn about new heads on commit (issue842)
Sun, 03 Feb 2008 19:29:05 -0600 Matt Mackall merge: allow smarter tool configuration
Wed, 01 Aug 2007 12:33:12 -0500 Matt Mackall merge: do early copy to deal with issue636
Fri, 22 Jun 2007 20:44:40 -0300 Alexis S. L. Carvalho merge: fix small bug with a failed merge across a rename