Mercurial > hg

view tests/test-conflict.out @ 5932:b014ff3fdaeb

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
qrecord: record complements commit, so qrecord should complement qnew Also there is an idea flying around to create something that will complement qrefresh: - maybe 'qammend'? or - 'qrefresh --interactive'? If we settle on '--interactive', then it would be conveniet to add this flag to 'commit' and 'qnew' as well.
author Kirill Smelkov <kirr@mns.spb.ru>
date Wed, 23 Jan 2008 21:49:39 +0300
parents 93a4e72b4f83
children 5af5f0f9d724
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