summaryrefslogtreecommitdiff
path: root/merge-blobs.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-08-17 13:09:57 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-08-17 13:09:57 -0700
commit791ad494835ac544d9e91573f3a65aeb97d126ed (patch)
tree03c5e9076cdf96f6efbf8d913d496f61ab45858b /merge-blobs.h
parentMerge branch 'en/abort-df-conflict-fixes' (diff)
parentxdiff: reduce indent heuristic overhead (diff)
downloadtgif-791ad494835ac544d9e91573f3a65aeb97d126ed.tar.xz
Merge branch 'sb/indent-heuristic-optim'
"git diff --indent-heuristic" had a bad corner case performance. * sb/indent-heuristic-optim: xdiff: reduce indent heuristic overhead
Diffstat (limited to 'merge-blobs.h')
0 files changed, 0 insertions, 0 deletions