t / t5100 / msg0015on commit Try normalizing files to avoid delete/modify conflicts when merging (331a183)
   1  - a list
   2  - of stuff