Mercurial > hg-stable
view tests/test-resolve.out @ 10480:3076b39d7f3e stable
mq: unify implementation of qinit and init -Q
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Mon, 15 Feb 2010 00:16:59 -0800 |
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