t / t5100 / msg0001on commit merge-recursive: Fix deletion of untracked file in rename/delete conflicts (531357a)
   1Here is a patch from A U Thor.
   2