t / t5100 / emptyon commit apply: register conflicted stages to the index (4f4a6cb)
   1