t / t5100 / msg0009on commit merge-recursive: Fix deletion of untracked file in rename/delete conflicts (531357a)
   1This is to fix diff-format documentation.
   2