t / t5100 / msg0009on commit merge-recursive: Nuke rename/directory conflict detection (605c1bc)
   1This is to fix diff-format documentation.
   2