t / t5100 / msg0007on commit Try normalizing files to avoid delete/modify conflicts when merging (331a183)
   1Here is an empty patch from A U Thor.
   2