Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2644:56e98084e040

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Make hgweb threads into daemon threads. This fixes the problem that an interrupted hg serve will not terminate until the next request has been received.
author Brendan Cully <brendan@kublai.com>
date Thu, 20 Jul 2006 21:58:25 -0700
parents b2ae81a7df29
children 46280c004f22
line wrap: on
line source

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
=======
something
M a