log tests/test-merge9 @ 7812:18048153fd4e

age author description
Fri, 19 Dec 2008 16:47:36 -0600 Matt Mackall resolve: require -a switch to resolve all files
Fri, 11 Apr 2008 12:52:56 -0500 Matt Mackall resolve: new command
Fri, 22 Jun 2007 20:44:40 -0300 Alexis S. L. Carvalho merge: fix small bug with a failed merge across a rename