log tests/test-merge-local @ 12018:fd206fabc14f

age author description
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho change tests to use simplemerge by default
Mon, 11 Dec 2006 18:09:52 +0100 Thomas Arendsen Hein Add instructions how to redo/finish failed merge with local working directory.