diff options
| author | Junio C Hamano <gitster@pobox.com> | 2019-10-23 14:43:09 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-23 14:43:09 +0900 |
| commit | b895e8dea66f7913bac3986beffbca64b47cbf1b (patch) | |
| tree | 5d477ee6c4a535c601b52979d59d9e12a1bbaf03 /contrib/diff-highlight/DiffHighlight.pm | |
| parent | c1ec35dd48ddc0d18249638f18888baf9b07d422 (diff) | |
| parent | 3b3c79f6c9cdd3fc6f5231e2d8c53ee732cfc771 (diff) | |
| download | git-b895e8dea66f7913bac3986beffbca64b47cbf1b.tar.gz | |
Merge branch 'nr/diff-highlight-indent-fix'
Code cleanup.
* nr/diff-highlight-indent-fix:
diff-highlight: fix a whitespace nit
Diffstat (limited to 'contrib/diff-highlight/DiffHighlight.pm')
| -rw-r--r-- | contrib/diff-highlight/DiffHighlight.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm index 7440aa1c46..e2589922a6 100644 --- a/contrib/diff-highlight/DiffHighlight.pm +++ b/contrib/diff-highlight/DiffHighlight.pm @@ -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 |