Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge-revert2.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 ad6f34c83c3d
children 93a4e72b4f83
line wrap: on
line diff
--- a/tests/test-merge-revert2.out
+++ b/tests/test-merge-revert2.out
@@ -9,7 +9,7 @@ 9eca13a34789
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
 f248da0d4c3e tip
 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
-merge: warning: conflicts during merge
+warning: conflicts during merge.
 merging file1
 merging file1 failed!
 0 files updated, 0 files merged, 0 files removed, 1 files unresolved