Mercurial > hg-stable

view tests/test-conflict.out @ 4170:7b5723c95a82

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Save an absolute path in repo.path This should keep things working if the process changes directories after creating a repo object.
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
date Sat, 10 Mar 2007 22:03:20 -0300
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