[PATCH] Documentation: git diff --check detects conflict markers

From: Ori Avtalion <ori@avtalion.name>
Date: Mar 29, 2016, 18:59 UTC
Message-ID: <1459277985-5776-1-git-send-email-ori@avtalion.name>
In-Reply-To: <xmqqd1qe1a2i.fsf@gitster.mtv.corp.google.com>

Signed-off-by: Ori Avtalion <ori@avtalion.name>
---
 Documentation/diff-options.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 306b7e3..32f48ed 100644
--- a/Documentation/diff-options.txt
+++ b/Documentation/diff-options.txt
@@ -286,8 +286,8 @@ endif::git-format-patch[]
 
 ifndef::git-format-patch[]
 --check::
-	Warn if changes introduce whitespace errors.  What are
-	considered whitespace errors is controlled by `core.whitespace`
+	Warn if changes introduce conflict markers or whitespace errors.
+	What are considered whitespace errors is controlled by `core.whitespace`
 	configuration.  By default, trailing whitespaces (including
 	lines that solely consist of whitespaces) and a space character
 	that is immediately followed by a tab character inside the

-- 
2.5.0