Mercurial > hg

view tests/test-commit-unresolved.out @ 8386:4aad982111b6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
inotify: Abstract the layer format and sizes to a inotify.common dictionary Instead of having a single possible request format, introduce a dictionary of possible messages in inotify.common
author Nicolas Dumazet <nicdumz.commits@gmail.com>
date Thu, 14 May 2009 15:48:47 +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