Mercurial > hg

view tests/test-resolve.out @ 11172:e9226eb3af2a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with 1.5.3
author Matt Mackall <mpm@selenic.com>
date Thu, 13 May 2010 11:33:11 -0500
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