Mercurial > hg
view tests/test-resolve.out @ 9468:b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Includes the change to the message itself, along with several test
output files that also had to change.
author | Stuart W Marks <smarks@smarks.org> |
---|---|
date | Thu, 17 Sep 2009 22:39:38 -0700 |
parents | 9fe7e6acf525 |
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