Merge branch 'jk/external-diff-use-argv-array'

diff --git a/gitweb/gitweb.perl b/gitweb/gitweb.perl
index 79057b7d0e4f6c76a9d9853be14bbef60fa9c1c0..a9f57d6f9024b2c23d6a2a67d33d84638e3bfb07 100755 (executable)
--- a/gitweb/gitweb.perl
+++ b/gitweb/gitweb.perl
@@ -1490,7 +1490,7 @@ sub is_valid_pathname {
        my $input = shift;
 
        return undef unless defined $input;
-       # no '.' or '..' as elements of path, i.e. no '.' nor '..'
+       # no '.' or '..' as elements of path, i.e. no '.' or '..'
        # at the beginning, at the end, and between slashes.
        # also this catches doubled slashes
        if ($input =~ m!(^|/)(|\.|\.\.)(/|$)!) {