Mercurial > hg
view tests/test-resolve.out @ 11188:b5c0f6a11430 stable
rebase: stress that only local changesets should be rebased
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Mon, 17 May 2010 21:16:35 +0200 |
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