Reintegrate: only detect conflict markers in conflicted files
Otherwise we would misidentify new sections in documentation set marked with ======= as conflict markers.
Junio C Hamano committed
Apr 2, 2009 at 10:19 UTC
6e916ab43913c1703eca314d15016761b5285616
1 file changed
+3
-2
Reintegrate
+3
-2
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