diff --git a/tests/test-merge-local.out b/tests/test-merge-local.out
--- a/tests/test-merge-local.out
+++ b/tests/test-merge-local.out
@@ -36,7 +36,7 @@ 2 files updated, 0 files merged, 3 files
 M zzz1_merge_ok
 M zzz2_merge_bad
 # local merge with conflicts
-merge: warning: conflicts during merge
+warning: conflicts during merge.
 merging zzz1_merge_ok
 merging zzz2_merge_bad
 merging zzz2_merge_bad failed!