log tests/test-merge9.out @ 6078:ebc23d34102f

age author description
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