tests/test-conflict.out
author Vadim Gelfer <vadim.gelfer@gmail.com>
Thu, 11 May 2006 10:14:48 -0700
changeset 2266 3f7692b0ff13
parent 2175 b2ae81a7df29
child 4361 46280c004f22
permissions -rw-r--r--
hooks: add preupdate and update hooks. preupdate run before working dir updated. can prevent update. update run after working dir updated.

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