tests/test-merge5.out

tests for new hooks.  fix things i found when writing tests.

removing b
this update spans a branch affecting the following files:
 b
aborting update spanning branches!
(use update -m to merge across branches or -C to lose changes)