git-rerere: detect unparsable conflicts

diff --git a/Makefile b/Makefile
index 06ebebe4b57d48b1ecb88123bdf0d214ecd303a8..6a31c9fedada5d9ea331f119044b3c2383671e60 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1290,6 +1290,9 @@ endif
 install-doc:
        $(MAKE) -C Documentation install
 
+install-html:
+       $(MAKE) -C Documentation install-html
+
 install-info:
        $(MAKE) -C Documentation install-info
 
@@ -1412,6 +1415,14 @@ check-docs::
                documented,gitmodules | \
                documented,gitcli | \
                documented,git-tools | \
+               documented,gitcore-tutorial | \
+               documented,gitcvs-migration | \
+               documented,gitdiffcore | \
+               documented,gitglossary | \
+               documented,githooks | \
+               documented,gitrepository-layout | \
+               documented,gittutorial | \
+               documented,gittutorial-2 | \
                sentinel,not,matching,is,ok ) continue ;; \
                esac; \
                case " $(ALL_PROGRAMS) $(BUILT_INS) git gitk " in \