Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-merge1.out @ 1236:67a28636ea64

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix bug with co -C across branches, update tests
author mpm@selenic.com
date Tue, 13 Sep 2005 18:38:27 -0500
parents 5a034646e472
children db10b7114de0
line wrap: on
line diff
--- a/tests/test-merge1.out
+++ b/tests/test-merge1.out
@@ -1,7 +1,13 @@
+%% no merges expected
+%% merge of b expected
 merging for b
 merging b
+%%
+Contents of b should be "this is file b1"
 This is file b1
+%% merge expected!
 merging for b
 merging b
+%% merge of b expected
 merging for b
 merging b