tests/test-issue619.out
author Nicolas Dumazet <nicdumz.commits@gmail.com>
Tue, 01 Dec 2009 09:53:02 +0900
changeset 10013 b2e87fde6806
parent 6375 cdc458b12f0f
child 11173 5b48d819d5f9
permissions -rw-r--r--
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.

adding a
marked working directory as branch b
adding b
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
fast-forward
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
bogus fast-forward should fail
abort: can't merge with ancestor
done