t6022: Add tests for reversing order of merges when D/F conflicts present

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 04f69cf64e5d989bac3cd1c235e6a7e657c6c103..e117bc4315f6e288e89cf83fb80e876bee7a7dc2 100644 (file)
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -6,7 +6,7 @@ MAN5_TXT=gitattributes.txt gitignore.txt gitmodules.txt githooks.txt \
        gitrepository-layout.txt
 MAN7_TXT=gitcli.txt gittutorial.txt gittutorial-2.txt \
        gitcvs-migration.txt gitcore-tutorial.txt gitglossary.txt \
-       gitdiffcore.txt gitworkflows.txt
+       gitdiffcore.txt gitrevisions.txt gitworkflows.txt
 
 MAN_TXT = $(MAN1_TXT) $(MAN5_TXT) $(MAN7_TXT)
 MAN_XML=$(patsubst %.txt,%.xml,$(MAN_TXT))
@@ -279,7 +279,7 @@ $(patsubst %,%.html,$(API_DOCS) technical/api-index): %.html : %.txt
 XSLT = docbook.xsl
 XSLTOPTS = --xinclude --stringparam html.stylesheet docbook-xsl.css
 
-user-manual.html: user-manual.xml
+user-manual.html: user-manual.xml $(XSLT)
        $(QUIET_XSLTPROC)$(RM) $@+ $@ && \
        xsltproc $(XSLTOPTS) -o $@+ $(XSLT) $< && \
        mv $@+ $@