Mercurial > hg

view tests/test-commit-unresolved.out @ 8236:9f53e203a09b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
webcommands: move nonempty logic from JavaScript to Python This avoids hard-coding the '(none)' string in the JavaScript for each style and avoids the {nonexisting|nonempty} hack which only works since the template system don't complain about undefined variables.
author Martin Geisler <mg@lazybytes.net>
date Tue, 28 Apr 2009 17:28:00 +0200
parents 9fe7e6acf525
children b2310903c462
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 up --clean' 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