summaryrefslogtreecommitdiff
path: root/t/t5515-fetch-merge-logic.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-07-25 14:13:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-25 14:13:35 -0700
commitf2cfb8fcc993b77b0a0420a84fd1a9a48cbe0ab9 (patch)
treec41fd869cc504b59f5c7c65feaea0fe457786344 /t/t5515-fetch-merge-logic.sh
parentMerge branch 'mh/ref-iterators' (diff)
parentdiff: fix a double off-by-one with --ignore-space-at-eol (diff)
downloadtgif-f2cfb8fcc993b77b0a0420a84fd1a9a48cbe0ab9.tar.xz
Merge branch 'js/ignore-space-at-eol'
An age old bug that caused "git diff --ignore-space-at-eol" misbehave has been fixed. * js/ignore-space-at-eol: diff: fix a double off-by-one with --ignore-space-at-eol diff: demonstrate a bug with --patience and --ignore-space-at-eol
Diffstat (limited to 't/t5515-fetch-merge-logic.sh')
0 files changed, 0 insertions, 0 deletions