summaryrefslogtreecommitdiff
path: root/t/t5515/refs.br-remote-explicit-merge
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2013-01-06 22:10:23 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2013-01-06 22:10:23 -0800
commit1965f8cdbdf86930b99fd61ed2efb22ac3d6a725 (patch)
tree69bc7a0dc0ee9c83f126523c4412bebc31e33b36 /t/t5515/refs.br-remote-explicit-merge
parentUpdate draft release notes to 1.8.2 (diff)
parentapply.c:update_pre_post_images(): the preimage can be truncated (diff)
downloadtgif-1965f8cdbdf86930b99fd61ed2efb22ac3d6a725.tar.xz
Merge branch 'jc/apply-trailing-blank-removal'
Fix to update_pre_post_images() that did not take into account the possibility that whitespace fix could shrink the preimage and change the number of lines in it. * jc/apply-trailing-blank-removal: apply.c:update_pre_post_images(): the preimage can be truncated
Diffstat (limited to 't/t5515/refs.br-remote-explicit-merge')
0 files changed, 0 insertions, 0 deletions