From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 2 Apr 2009 17:19:54 +0000 (-0700)
Subject: Reintegrate: only detect conflict markers in conflicted files
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e916ab43913c1703eca314d15016761b5285616;p=thirdparty%2Fgit.git

Reintegrate: only detect conflict markers in conflicted files

Otherwise we would misidentify new sections in documentation set
marked with ======= as conflict markers.
---

diff --git a/Reintegrate b/Reintegrate
index cb75f128fd..dfc5184226 100755
--- a/Reintegrate
+++ b/Reintegrate
@@ -22,8 +22,9 @@ accept_rerere () {
 	then
 		return 1
 	fi
-	if git diff HEAD |
-		grep -e "^+<<<<<<<" -e "^+=======" -e "^+>>>>>>>" >/dev/null
+	if git diff |
+	   grep -e "^.+" -e "^+." |
+	   grep -e "^..<<<<<<<" -e "^..=======" -e "^..>>>>>>>" >/dev/null
 	then
 		return 1
 	else