log tests/test-merge9 @ 7287:6e9fe4ff9c54

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