diff -r 48dd8a93d6db -r 3682a19bb637 tests/test-merge1.out --- a/tests/test-merge1.out Fri May 22 18:57:53 2009 +0200 +++ b/tests/test-merge1.out Fri May 22 11:42:21 2009 -0500 @@ -40,7 +40,7 @@ Contents of b should be "this is file b1" This is file b1 %% merge fails -abort: outstanding uncommitted changes +abort: outstanding uncommitted changes (use 'hg status' to list changes) %% merge expected! 1 files updated, 0 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit) @@ -54,7 +54,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved created new head %% merge of b should fail -abort: outstanding uncommitted changes +abort: outstanding uncommitted changes (use 'hg status' to list changes) %% merge of b expected merging for b merging b