"Edward Z. Yang" <edwardzyang@xxxxxxxxxxxxxxxxx> writes: > Apparently, the conflict information Git writes to the working copy > during merge doesn't respect core.autocrlf,... Is this an old news before 249c61a (merge-recursive: respect core.autocrlf when writing out the result, 2008-06-09) happened? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html