changeset 1995 | 2da2d46862fb |
parent 1933 | 7544700fd931 |
child 2019 | ced2d3620f95 |
--- a/tests/test-up-local-change.out +++ b/tests/test-up-local-change.out @@ -103,7 +103,7 @@ this update spans a branch affecting the aborting update spanning branches! (use update -m to merge across branches or -C to lose changes) failed -abort: outstanding uncommited changes +abort: outstanding uncommitted changes failed resolving manifests force None allow 1 moddirstate True linear False