tests/test-merge3.out

make hook code nicer.
pre hooks can raise exception if fail.
tidy up better if exception raised (like KeyboardInterrupt) when running
hook program.

removing b
b never committed!
nothing changed