Mercurial > hg

view tests/test-commit-unresolved.out @ 9493:fe1ecd15c6bd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keyword: make kwfiles -u show untracked files only (like status) Remove extra documentation of -u/--unknown, as this is covered in the option help already. Like commands.status the code now zips the status flags. Add more kwfiles tests.
author Christian Ebert <blacktrash@gmx.net>
date Wed, 30 Sep 2009 23:59:03 +0200
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