Documentation/technical/api-diff.txt: correct name of diff_unmerge()

diff --git a/gitweb/Makefile b/gitweb/Makefile
index e32ee76309606c82abcac483f8801968916047f2..0a6ac00631ed8eac5c20248a345074e4b8ff3707 100644 (file)
--- a/gitweb/Makefile
+++ b/gitweb/Makefile
@@ -40,6 +40,7 @@ HIGHLIGHT_BIN = highlight
 # include user config
 -include ../config.mak.autogen
 -include ../config.mak
+-include config.mak
 
 # determine version
 ../GIT-VERSION-FILE: .FORCE-GIT-VERSION-FILE
@@ -145,6 +146,15 @@ gitweb.cgi: gitweb.perl GITWEB-BUILD-OPTIONS
        chmod +x $@+ && \
        mv $@+ $@
 
+### Testing rules
+
+test:
+       $(MAKE) -C ../t gitweb-test
+
+test-installed:
+       GITWEB_TEST_INSTALLED='$(DESTDIR_SQ)$(gitwebdir_SQ)' \
+               $(MAKE) -C ../t gitweb-test
+
 ### Installation rules
 
 install: all
@@ -158,5 +168,5 @@ install: all
 clean:
        $(RM) gitweb.cgi static/gitweb.min.js static/gitweb.min.css GITWEB-BUILD-OPTIONS
 
-.PHONY: all clean install .FORCE-GIT-VERSION-FILE FORCE
+.PHONY: all clean install test test-installed .FORCE-GIT-VERSION-FILE FORCE