Mercurial > hg > mercurial-crew-with-dirclash

diff tests/test-conflict.out @ 2178:00205fe76993

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge with crew.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Tue, 02 May 2006 14:38:32 -0700
parents b2ae81a7df29
children 46280c004f22
line wrap: on
line diff
--- a/tests/test-conflict.out
+++ b/tests/test-conflict.out
@@ -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
 =======