X-Git-Url: https://git.ladys.computer/Gitweb/blobdiff_plain/ffd21ad196c8e1e7f0855e5b04121b9784ef801db5ee6025804809ad2d9cc4c5..cc8201643cab52770ddf95c5e381b79477f1e3bbf8d310e47705a6c6dff28ae3:/gitweb.perl diff --git a/gitweb.perl b/gitweb.perl index d1264ba..2e0de7e 100755 --- a/gitweb.perl +++ b/gitweb.perl @@ -742,7 +742,7 @@ sub evaluate_gitweb_config { $GITWEB_CONFIG_SYSTEM = "" if ($GITWEB_CONFIG_SYSTEM eq $GITWEB_CONFIG_COMMON); # Common system-wide settings for convenience. - # Those settings can be ovverriden by GITWEB_CONFIG or GITWEB_CONFIG_SYSTEM. + # Those settings can be overridden by GITWEB_CONFIG or GITWEB_CONFIG_SYSTEM. read_config_file($GITWEB_CONFIG_COMMON); # Use first config file that exists. This means use the per-instance @@ -5286,7 +5286,7 @@ sub format_ctx_rem_add_lines { # + c # + d # - # Otherwise the highlightling would be confusing. + # Otherwise the highlighting would be confusing. if ($is_combined) { for (my $i = 0; $i < @$add; $i++) { my $prefix_rem = substr($rem->[$i], 0, $num_parents);