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

Junio C Hamano committed Jan 6, 2013 at 22:10 UTC 1965f8cdbdf86930b99fd61ed2efb22ac3d6a725

No changes.