Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge-local.out @ 4361:46280c004f22

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
change tests to use simplemerge by default
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Mon, 16 Apr 2007 20:17:39 -0300
parents 4787e2b0dd03
children 0912d8df5e19
line wrap: on
line diff
--- 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!