| commit | 3af69e7a072515979f1aecd81a637ca3b6bdcf46 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 26 Nov 2012 22:12:54 +0000 (26 14:12 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 26 Nov 2012 22:12:54 +0000 (26 14:12 -0800) | ||
| tree | a691adc27077a87a6cbbb31441fe508b65729cd8 | treesnapshot (tar.gz zip) |
| parent | 9942e54037a4342f619d609da15329417569d00b | commitdiff |
| parent | 5de7166d46d25fed3b8a181c3842cf4350ecdea4 | commitdiff |
Merge branch 'jc/apply-trailing-blank-removal' into next
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
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
| builtin/apply.c | diff1 | diff2 | blobhistory |