view tests/test-inotify-issue1371.out @ 11353:f2b25e8ea6c1

merge: when current branch has 1 or > 2 heads, actually abort.

Currently merge just prints abort-like messages to stderr and then
exits with a misleading status 0 (cleverly disguised as "False").
With this change it raises Abort, just like every other fatal error.

inserv1
% inserve
adding a
adding b
adding c
adding d
adding e
adding f
adding hg.pid
M c
A g
A h
R a
R e
! b
Are we able to kill the service? if not, the service died on some error