Mercurial > hg

view tests/test-conflict.out @ 7035:9d023ef7b467

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
forbid username with '\n' at the changelog level It was already forbidden for ui.username() but no verification were made for username passed through the commandline.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sat, 13 Sep 2008 17:46:09 +0200
parents 4b0c9c674707
children 92ccccb55ba3
line wrap: on
line source

1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
merging a
warning: conflicts during merge.
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
<<<<<<< local
something else
=======
something
>>>>>>> other
M a
? a.orig