--- a/tests/test-merge1.out
+++ b/tests/test-merge1.out
@@ -10,7 +10,7 @@ diff -r d9e5953b9dec b
 M b
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 %% merge should fail
-abort: 'b' already exists in the working dir and differs from remote
+abort: untracked local file 'b' differs from remote version
 %% merge of b expected
 merging for b
 merging b