Mercurial > hg

view tests/test-commit-unresolved.out @ 7330:781af9bb9684

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix test output for updated gitdiffs help and web template cleanups
author Thomas Arendsen Hein <thomas@intevation.de>
date Fri, 07 Nov 2008 13:08:34 +0100
parents 7c36a4fb05a3
children 9fe7e6acf525
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

% Correct the conflict without marking the file as resolved
abort: unresolved merge conflicts (see hg resolve)

% Mark the conflict as resolved and commit