summaryrefslogtreecommitdiff
path: root/t/t5604-clone-reference.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2017-05-08 19:30:24 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2017-05-08 19:33:31 -0700
commite294e8959fea043225a023f981121540b14b08cd (patch)
tree5610ffe8b03978a48e752db9e8d7174db5f9cc04 /t/t5604-clone-reference.sh
parentPrepare for 2.12.3 (diff)
downloadtgif-e294e8959fea043225a023f981121540b14b08cd.tar.xz
apply.c: fix whitespace-only mismerge
4af9a7d3 ("Merge branch 'bc/object-id'", 2016-09-19) involved merging a lot of changes made to builtin/apply.c on the side branch manually to apply.c as an intervening commit 13b5af22 ("apply: move libified code from builtin/apply.c to apply.{c,h}", 2016-04-22) moved a lot of the lines changed on the side branch to a different file apply.c at the top-level, requiring manual patching of it. Apparently, the maintainer screwed up and made the code indent in a funny way while doing so. Reported-by: Stefan Beller <sbeller@google.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5604-clone-reference.sh')
0 files changed, 0 insertions, 0 deletions