From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 7 Jan 2013 06:10:23 +0000 (-0800)
Subject: Merge branch 'jc/apply-trailing-blank-removal'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1965f8cdbdf86930b99fd61ed2efb22ac3d6a725;p=git.git

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
---

1965f8cdbdf86930b99fd61ed2efb22ac3d6a725