Mercurial > hg
view tests/test-resolve.out @ 11208:2313dc4d9817
tests: fix bashism to load helpers.sh
`source` isn't available at POSIX sh.
author | Yuya Nishihara <yuya@tcha.org> |
---|---|
date | Fri, 21 May 2010 20:55:18 +0900 |
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