Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 4694:6bf58c9400e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mercurial.el: ignore errors on hg-after-save-hook() Don't signal an error even if running hg command fails. Otherwise, succeeding hooks won't be called.
author NIIMI Satoshi <sa2c@sa2c.net>
date Tue, 22 May 2007 07:24:06 +0900
parents 93a4e72b4f83
children
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
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
<<<<<<< my
something else
=======
something
>>>>>>> other
M a