log tests/test-merge-commit @ 4319:8ece1ba156c7

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