summaryrefslogtreecommitdiff
path: root/t/t4042-diff-textconv-caching.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-21 22:57:49 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-21 22:57:49 +0900
commita51c63809e67a40767313df3bb1ca3e88053ff1f (patch)
tree80db21ebef287c8de160958272c749cdcfa384a7 /t/t4042-diff-textconv-caching.sh
parentMerge branch 'sg/split-index-racefix' into maint (diff)
parentlog: fix coloring of certain octopus merge shapes (diff)
downloadtgif-a51c63809e67a40767313df3bb1ca3e88053ff1f.tar.xz
Merge branch 'np/log-graph-octopus-fix' into maint
"git log --graph" showing an octopus merge sometimes miscounted the number of display columns it is consuming to show the merge and its parent commits, which has been corrected. * np/log-graph-octopus-fix: log: fix coloring of certain octopus merge shapes
Diffstat (limited to 't/t4042-diff-textconv-caching.sh')
0 files changed, 0 insertions, 0 deletions