t / t5100 / msg0009on commit merge-recursive: make sure when we say we abort that we actually abort (9270239)
   1This is to fix diff-format documentation.
   2