Mercurial > hg
view tests/test-resolve.out @ 10236:49a8625b8cac
shrink-revlog: help/doc tweaks
- make it look right in 'hg help extensions'
- clarify --revlog option
- add a main program to tell users this is no longer a standalone script
author | Greg Ward <greg-hg@gerg.ca> |
---|---|
date | Tue, 12 Jan 2010 15:12:53 +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