t / t5100 / emptyon commit merge-recursive: Fix deletion of untracked file in rename/delete conflicts (531357a)
   1