summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-10-23 05:43:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2019-10-23 05:43:09 (GMT)
commitb895e8dea66f7913bac3986beffbca64b47cbf1b (patch)
tree5d477ee6c4a535c601b52979d59d9e12a1bbaf03 /contrib
parentc1ec35dd48ddc0d18249638f18888baf9b07d422 (diff)
parent3b3c79f6c9cdd3fc6f5231e2d8c53ee732cfc771 (diff)
downloadgit-b895e8dea66f7913bac3986beffbca64b47cbf1b.zip
git-b895e8dea66f7913bac3986beffbca64b47cbf1b.tar.gz
git-b895e8dea66f7913bac3986beffbca64b47cbf1b.tar.bz2
Merge branch 'nr/diff-highlight-indent-fix'
Code cleanup. * nr/diff-highlight-indent-fix: diff-highlight: fix a whitespace nit
Diffstat (limited to 'contrib')
-rw-r--r--contrib/diff-highlight/DiffHighlight.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/diff-highlight/DiffHighlight.pm b/contrib/diff-highlight/DiffHighlight.pm
index 7440aa1..e258992 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