Mercurial > hg

view tests/test-conflict.out @ 2477:857591c586e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
use commit time as mtime for file archives. now output from two run of "hg archive -t zip" is same.
author Vadim Gelfer <vadim.gelfer@gmail.com>
date Wed, 21 Jun 2006 15:31:23 -0700
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