Mercurial > hg

view tests/test-commit-unresolved.out @ 7812:18048153fd4e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-convert-cvs*: mute output from "cvs up" Apparently some versions of cvs outputs more than other versions. That is however not relevant for these tests.
author Mads Kiilerich <mads@kiilerich.com>
date Fri, 27 Feb 2009 17:52:31 +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