Merge branch 'jk/mailmap-incomplete-line' into maint

diff --git a/t/gitweb-lib.sh b/t/gitweb-lib.sh
index ae2dc4604f708d320d88d4f99ca9d575d88b6124..9e381e000f6cbece882dec43d2a3dbab3d18a983 100644 (file)
--- a/t/gitweb-lib.sh
+++ b/t/gitweb-lib.sh
@@ -36,7 +36,7 @@ EOF
 
        # You can set the GITWEB_TEST_INSTALLED environment variable to
        # the gitwebdir (the directory where gitweb is installed / deployed to)
-       # of an existing gitweb instalation to test that installation,
+       # of an existing gitweb installation to test that installation,
        # or simply to pathname of installed gitweb script.
        if test -n "$GITWEB_TEST_INSTALLED" ; then
                if test -d $GITWEB_TEST_INSTALLED; then