log tests/test-merge-commit.out @ 5166:b1e147f60d62

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