Mercurial > hg

view tests/test-commit-unresolved.out @ 7154:7fdf7a0a41b7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
index parser: fix refcounting in case of errors, refactor due to incorrect refcounting, on a bad revlog it was failing with: *** glibc detected *** /usr/bin/python: corrupted double-linked list: 0x0816d318 *** and a backtrace.
author Benoit Boissinot <benoit.boissinot@ens-lyon.org>
date Sun, 19 Oct 2008 01:26:46 +0200
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