git-rerere: detect unparsable conflicts

diff --git a/Makefile b/Makefile
index b003e3e60a1aecae27497d941d211849bedec02b..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