From: Ori Avtalion <ori@avtalion.name>
Date: Mon, 28 Mar 2016 22:44:06 GMT
Subject: Warning about conflict markers - undocumented 'diff --check' feature & suggestion
Message-ID: <CALgdb5JuoYpHAPxTY2cHdbkcPUjKtsWQ_DY5rBrw-YKCwj2yvw@mail.gmail.com>

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".

This check will also be useful in `git add`, to prevent accidental
staging of conflict markers.
Perhaps it could be included, if not by default, then at least with a
configuration setting.

Thoughts? Is this perhaps an existing feature that I'm missing? :)

-Ori