Mercurial > hg
annotate 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 |
rev | line source |
---|---|
7734 | 1 adding file |
2 % create a second head | |
3 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
4 created new head | |
5 % failing merge | |
6 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |
9468
b2310903c462
hg: say 'hg update' instead of 'hg up' in merge status message
Stuart W Marks <smarks@smarks.org>
parents:
7821
diff
changeset
|
7 use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon |
7734 | 8 % resolve -l, should be empty |