log tests/test-merge7.out @ 5279:2dbd750b3ddd

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
Tue, 10 Oct 2006 02:15:20 -0500 Matt Mackall merge: various tidying