t / t5100 / msg0007on commit Keep rename/rename conflicts of intermediate merges while doing recursive merge (a97e407)
   1Here is an empty patch from A U Thor.
   2