Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-up-local-change.out @ 1581:db10b7114de0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
abort when merging two heads and repository has local changes
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Wed, 14 Dec 2005 22:19:03 -0600
parents 0e2be889ccd7
children 3b1b44b917f4
line wrap: on
line diff
--- a/tests/test-up-local-change.out
+++ b/tests/test-up-local-change.out
@@ -16,6 +16,8 @@ getting b
 merging a
 resolving a
 file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
+abort: outstanding uncommited changes
+failed
 resolving manifests
  force None allow 1 moddirstate True linear True
  ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e