diff options
| author |  Jiang Xin <worldhello.net@gmail.com> | 2019-10-28 13:18:55 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2019-10-28 13:18:55 +0800 |
| commit | 468d356a811f527501bd408c97f5c12333b8bfe3 (patch) | |
| tree | fd71542752e92600f28c63fa309f864c85989359 /contrib/diff-highlight/DiffHighlight.pm | |
| parent | l10n: it.po: update the Italian translation for Git 2.24.0 (diff) | |
| parent | Git 2.24-rc1 (diff) | |
| download | tgif-468d356a811f527501bd408c97f5c12333b8bfe3.tar.xz | |
Merge tag 'v2.24.0-rc1' of github.com:git/git into master
Git 2.24-rc1
* tag 'v2.24.0-rc1' of github.com:git/git:
Git 2.24-rc1
repo-settings: read an int for index.version
ci: fix GCC install in the Travis CI GCC OSX job
Eleventh batch
ci(osx): use new location of the `perforce` cask
t7419: change test_must_fail to ! for grep
t4014: make output-directory tests self-contained
ci(visual-studio): actually run the tests in parallel
ci(visual-studio): use strict compile flags, and optimization
userdiff: fix some corner cases in dts regex
test-progress: fix test failures on big-endian systems
completion: clarify installation instruction for zsh
grep: avoid leak of chartables in PCRE2
grep: make PCRE2 aware of custom allocator
grep: make PCRE1 aware of custom allocator
remote-curl: pass on atomic capability to remote side
diff-highlight: fix a whitespace nit
fsmonitor: don't fill bitmap with entries to be removed
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 |