t / t4013 / diff.diff-tree_masteron commit Avoid conflicts when merging branches with mixed normalization (f217f0e)
   1$ git diff-tree master
   2$