summaryrefslogtreecommitdiff
path: root/builtin
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-10-17 13:29:19 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-10-17 13:29:19 +0900
commit91ccfb85176fbe2ed416751ff7884cdaf61311cb (patch)
tree751cf5f7235e9a2eb10521a3224178500b01472a /builtin
parentMerge branch 'js/rebase-i-final' (diff)
parentdiff: fix infinite loop with --color-moved --ignore-space-change (diff)
downloadtgif-91ccfb85176fbe2ed416751ff7884cdaf61311cb.tar.xz
Merge branch 'sb/diff-color-move'
A recently added "--color-moved" feature of "diff" fell into infinite loop when ignoring whitespace changes, which has been fixed. * sb/diff-color-move: diff: fix infinite loop with --color-moved --ignore-space-change
Diffstat (limited to 'builtin')
0 files changed, 0 insertions, 0 deletions