Mercurial > hg
view tests/test-resolve.out @ 9241:d98cef25b5af
Merge with crew-stable
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Fri, 24 Jul 2009 15:28:29 +0200 |
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