Mercurial > hg
view tests/test-resolve.out @ 11692:52e4ac3e63f7 stable
tag: do not allow tag names to consist solely of whitespace (issue2307)
(simplification and test by mpm)
author | Benjamin Pollack <benjamin@bitquabit.com> |
---|---|
date | Tue, 27 Jul 2010 14:40:25 -0400 |
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