Browse Source

Merge branch 'nr/diff-highlight-indent-fix'

Code cleanup.

* nr/diff-highlight-indent-fix:
  diff-highlight: fix a whitespace nit
maint
Junio C Hamano 5 years ago
parent
commit
b895e8dea6
  1. 2
      contrib/diff-highlight/DiffHighlight.pm

2
contrib/diff-highlight/DiffHighlight.pm

@ -72,7 +72,7 @@ sub handle_line { @@ -72,7 +72,7 @@ sub handle_line {
(?:$COLOR?\|$COLOR?[ ])* # zero or more trailing "|"
[ ]* # trailing whitespace for merges
/x) {
my $graph_prefix = $&;
my $graph_prefix = $&;

# We must flush before setting graph indent, since the
# new commit may be indented differently from what we

Loading…
Cancel
Save