diff tests/test-merge1.out @ 5670:840e2b315c1f

Fix misleading error and prompts during update/merge (issue556)

--- a/tests/test-merge1.out	Tue Dec 25 22:21:51 2007 +0100
+++ b/tests/test-merge1.out	Wed Dec 26 22:47:16 2007 +0100
@@ -10,7 +10,7 @@
 M b
 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
 %% merge should fail
-abort: untracked local file 'b' differs from remote version
+abort: untracked file in working directory differs from file in requested revision: 'b'
 %% merge of b expected
 merging for b
 merging b