t / t5100 / emptyon commit merge script: handle --no-ff --no-commit correctly (2a70fa4)
   1