log tests/test-merge-force @ 6679:d286ec1bdcff

age author description
Fri, 14 Mar 2008 09:56:58 -0300 Alexis S. L. Carvalho merge: require --force when there are deleted files
Fri, 14 Mar 2008 09:56:58 -0300 Alexis S. L. Carvalho add a test for a375ffc2aa1b