Mercurial > hg
view tests/test-resolve.out @ 10013:b2e87fde6806
run-tests: --inotify: use inotify.appendpid to append pids to $DAEMON_PIDS
Introduce a inotify.appendpid configuration possibility that appends pids
to inotify.pidfile when set to True.
author | Nicolas Dumazet <nicdumz.commits@gmail.com> |
---|---|
date | Tue, 01 Dec 2009 09:53:02 +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