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
@@ -22,8 +22,9 @@ accept_rerere () {
22
then
23
return 1
24
fi
25
- if git diff HEAD |
26
- grep -e "^+<<<<<<<" -e "^+=======" -e "^+>>>>>>>" >/dev/null
25
+ if git diff |
26
+ grep -e "^.+" -e "^+." |
27
+ grep -e "^..<<<<<<<" -e "^..=======" -e "^..>>>>>>>" >/dev/null
28
then
29
return 1
30
else