Mercurial > hg

diff tests/test-merge-force.out @ 6256:69c75d063c7a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: require --force when there are deleted files
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Fri, 14 Mar 2008 09:56:58 -0300
parents ae83d927c629
children 4b0c9c674707
line wrap: on
line diff
--- a/tests/test-merge-force.out	Fri Mar 14 09:56:58 2008 -0300
+++ b/tests/test-merge-force.out	Fri Mar 14 09:56:58 2008 -0300
@@ -1,4 +1,5 @@
 % local deleted a file, remote removed
+abort: outstanding uncommitted changes
 resolving manifests
 removing a
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved