Mercurial Mercurial > hg / file revision
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests/test-commit-unresolved.out
author Patrick Mezard <pmezard@gmail.com>
Sun, 25 Jan 2009 18:58:12 +0100
changeset 7690 1574c2704b11
parent 6888 7c36a4fb05a3
child 7821 9fe7e6acf525
permissions -rw-r--r--
Merge with crew-stable

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
Mercurial