Mercurial > hg
view tests/test-resolve.out @ 7836:bc0a87123ab8
Merge with main
author | Brendan Cully <brendan@kublai.com> |
---|---|
date | Fri, 06 Mar 2009 12:35:48 -0800 |
parents | 9fe7e6acf525 |
children | b2310903c462 |
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 up --clean' to abandon % resolve -l, should be empty