Mercurial > hg
view tests/test-resolve.out @ 11916:d1ea16ca6520
tests: unify test-subrepo-svn
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Tue, 17 Aug 2010 16:53:03 +0200 |
parents | 51021f4c80b5 |
children |
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 % resolve -l, should be empty