Mercurial > hg > mercurial-crew-with-dirclash

view tests/test-conflict.out @ 4889:d69b1fb111b9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tag: handle .hgtags and .hg/localtags with missing final newline (issue 601) This also fixes an asymmetry bug in which we called the pretag hook if we were going to create a local tag, but didn't call the tag hook afterwards.
author Bryan O'Sullivan <bos@serpentine.com>
date Mon, 16 Jul 2007 20:15:03 -0700
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