Ori Avtalion <[email protected]> writes: > A bug report and a suggestion: > > `git diff --check` has been warning about conflict markers since 2008: > https://marc.info/?l=git&m=122398500726634&w=2 > > This is an undocumented feature. The current documentation for the > flag only mentions "whitespace errors".
Thanks for digging (even though I do not think the message you quoted has much to do with this). 04954043 (diff --check: detect leftover conflict markers, 2008-06-26) was the change that added this check to the "check whitespace breakage" codepath, which forgot to update the documentation. And when 4f830390 (Documentation: git diff --check respects core.whitespace, 2011-06-22) rewrote the paragraph, it again didn't remember to update it to match the reality. Care to try a patch? -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to [email protected] More majordomo info at http://vger.kernel.org/majordomo-info.html
