Mercurial > hg

view tests/test-commit-unresolved.out @ 9582:a25af3af941c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: add -k to test scripts matching keywords argument is a space-separated list of keywords that are searched for in the name and body of each test. This makes it easy to run only tests related to tags, hgweb, revert, etc. (eg -k "tag hgweb revert").
author Matt Mackall <mpm@selenic.com>
date Mon, 12 Oct 2009 14:52:53 -0500
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