Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 2452:d1a7c8a5b835

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Emacs: use delete-region instead of kill-* functions. This patch eliminates `kill-line' which taints kill-ring, and `kill-entire-line' which is specific for XEmacs.
author FUJIWARA Katsunori <foozy@lares.dti.ne.jp>
date Sat, 17 Jun 2006 00:06:28 +0900
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