t / t5100 / emptyon commit sequencer: signal failed ff as an aborted, not a conflicted merge (43dee07)
   1