Mercurial > hg

view tests/test-resolve.out @ 10524:3212afb33116 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch: fix patching with fuzz and eol normalization
author Patrick Mezard <pmezard@gmail.com>
date Mon, 22 Feb 2010 22:55:58 +0100
parents b2310903c462
children 51021f4c80b5
line wrap: on
line source

adding file
% create a second head
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
created new head
% failing merge
0 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
% resolve -l, should be empty