log tests/test-merge-commit @ 7750:b03416194895

age author description
Mon, 16 Apr 2007 20:17:39 -0300 Alexis S. L. Carvalho change tests to use simplemerge by default
Tue, 30 Jan 2007 19:09:08 -0200 Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename