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 cb75f128fda8533a2682b8cc80270355778fa423..dfc51842260a0356c74667a1534539cbd0ffbc7d 100755 (executable)
--- 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