tests/test-conflict.out
author Alexis S. L. Carvalho <alexis@cecm.usp.br>
Sun, 22 Oct 2006 01:01:03 -0300
changeset 3475 03932425cfd8
parent 2175 b2ae81a7df29
child 4361 46280c004f22
permissions -rw-r--r--
bash_completion: don't complete export with "garbage" when mq is not around The "garbage" is the output of hg help printed when a command is not found.

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