Mercurial > hg

view tests/test-commit-unresolved.out @ 10633:3318431f2ab4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-serve: Show if port config and option are correctly used this will break in d3f27d15c9cb
author Thomas Arendsen Hein <thomas@intevation.de>
date Wed, 10 Mar 2010 22:05:41 +0100
parents b2310903c462
children
line wrap: on
line source

1 files updated, 0 files merged, 1 files removed, 0 files unresolved
created new head

% Merging a conflict araises
merging A
warning: conflicts during merge.
merging A failed!
1 files updated, 0 files merged, 0 files removed, 1 files unresolved
use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon

% Correct the conflict without marking the file as resolved
abort: unresolved merge conflicts (see hg resolve)

% Mark the conflict as resolved and commit