log tests/test-merge7 @ 5366:d0c48891dd4a

age author description
Sat, 28 Apr 2007 17:55:45 -0300 Alexis S. L. Carvalho run-tests.py: pass -L/--label to simplemerge
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho change tests to use simplemerge by default
Fri, 01 Dec 2006 13:34:09 +0100 Benoit Boissinot switch to the .hg/store layout, fix the tests