Mercurial > hg
view tests/test-resolve.out @ 10628:6227c8d669d5
rebase: improve output of hg pull --rebase (issue2072)
author | Sune Foldager <cryo@cyanite.org> |
---|---|
date | Wed, 10 Mar 2010 12:38:33 +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