changeset 8545 | 3682a19bb637 |
parent 6336 | 4b0c9c674707 |
--- a/tests/test-merge-force.out Fri May 22 18:57:53 2009 +0200 +++ b/tests/test-merge-force.out Fri May 22 11:42:21 2009 -0500 @@ -1,6 +1,6 @@ created new head % local deleted a file, remote removed -abort: outstanding uncommitted changes +abort: outstanding uncommitted changes (use 'hg status' to list changes) resolving manifests removing a 0 files updated, 0 files merged, 1 files removed, 0 files unresolved