log tests/test-merge-force.out @ 10064:6f30c35766d6

age author description
Fri, 22 May 2009 11:42:21 -0500 Steve Borho merge: give hint as to how to discover uncommitted changes
Fri, 21 Mar 2008 11:06:02 +0100 Dirkjan Ochtman warn about new heads on commit (issue842)
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