mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
Code cleanup.

* nr/diff-highlight-indent-fix:
  diff-highlight: fix a whitespace nit
This commit is contained in:
Junio C Hamano
2019-10-23 14:43:09 +09:00
parent c1ec35dd48 3b3c79f6c9
commit b895e8dea6
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/diff-highlight/DiffHighlight.pm
View File

@ -72,7 +72,7 @@ sub handle_line {
(?:$COLOR?\|$COLOR?[ ])* # zero or more trailing "|" (?:$COLOR?\|$COLOR?[ ])* # zero or more trailing "|"
[ ]* # trailing whitespace for merges [ ]* # trailing whitespace for merges
/x) { /x) {
my $graph_prefix = $&; my $graph_prefix = $&;
# We must flush before setting graph indent, since the # We must flush before setting graph indent, since the
# new commit may be indented differently from what we # new commit may be indented differently from what we