Mercurial > hg

view tests/test-commit-unresolved.out @ 7007:a6b74fbb5ce0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fetch: added support for named branches Previously, fetch didn't really work when there were multiple named branches in the repository. Now it tries to do the right thing(tm) in all situations.
author Sune Foldager <cryo@cyanite.org>
date Mon, 08 Sep 2008 12:55:46 +0200
parents 7c36a4fb05a3
children 9fe7e6acf525
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

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

% Mark the conflict as resolved and commit