t / t5100 / msg0001on commit Avoid conflicts when merging branches with mixed normalization (f217f0e)
   1Here is a patch from A U Thor.
   2