diff options
| author | Vincent Ambo <tazjin@google.com> | 2020-05-22T16·46+0100 |
|---|---|---|
| committer | Vincent Ambo <tazjin@google.com> | 2020-05-22T16·46+0100 |
| commit | 5229c9b232de5bfa959ad6ebbb4c8192ac513352 (patch) | |
| tree | 8539e7e23682cac110900f946f034ae44162cacd /third_party/git/contrib/diff-highlight | |
| parent | f2b211131f2347342dde63975b09cf603149f1a3 (diff) | |
| parent | 8518a7a51faaf50f830646d4c3585f51236b9349 (diff) | |
merge(3p/git): Merge git upstream at v2.26.2 r/808
Diffstat (limited to 'third_party/git/contrib/diff-highlight')
| -rw-r--r-- | third_party/git/contrib/diff-highlight/DiffHighlight.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/git/contrib/diff-highlight/DiffHighlight.pm b/third_party/git/contrib/diff-highlight/DiffHighlight.pm index 7440aa1c4638..e2589922a659 100644 --- a/third_party/git/contrib/diff-highlight/DiffHighlight.pm +++ b/third_party/git/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 |