Mercurial > hg > pyhgsh

view tests/test-conflict.out @ 2244:76be4e66ddc8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Just using 'make' now shows help. 'make all' doesn't perform inplace build.
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 10 May 2006 18:53:32 +0200
parents b2ae81a7df29
children
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