changeset 2175 | b2ae81a7df29 |
parent 1933 | 7544700fd931 |
child 4365 | 46280c004f22 |
--- a/tests/test-conflict.out Mon May 01 19:17:34 2006 +0200 +++ b/tests/test-conflict.out Tue May 02 18:44:02 2006 +0200 @@ -1,6 +1,11 @@ +1 files updated, 0 files merged, 0 files removed, 0 files unresolved merge: warning: conflicts during merge merging a merging a failed! +0 files updated, 0 files merged, 0 files removed, 1 files unresolved +There are unresolved merges, you can redo the full merge using: + hg update -C 2 + hg merge 1 e7fe8eb3e180+0d24b7662d3e+ tip something else =======