Skip to content

Commit

Permalink
Merge branch 'do/gitweb-typofix-in-comments'
Browse files Browse the repository at this point in the history
Typofix.

* do/gitweb-typofix-in-comments:
  gitweb: fix a couple spelling errors in comments
  • Loading branch information
gitster committed Jan 8, 2020
2 parents fe47c9c + 4e2c4c0 commit c5dc206
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions gitweb/gitweb.perl
Original file line number Diff line number Diff line change
Expand Up @@ -741,7 +741,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
Expand Down Expand Up @@ -5285,7 +5285,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);
Expand Down

0 comments on commit c5dc206

Please sign in to comment.