tests/test-up-local-change.out
changeset 1581 db10b7114de0
parent 1351 0e2be889ccd7
child 1637 3b1b44b917f4
--- 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