diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2013-01-14 07:33:08 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-01-14 07:33:08 -0800 |
| commit | 7842c44ccb89dc6c88e67bcc559bc9b38c617e0c (patch) | |
| tree | 1a38b06514b6b94e9310bf18f72634bcfdb97ab0 /t/t7607-merge-overwrite.sh | |
| parent | Merge branch 'pf/editor-ignore-sigint' into maint (diff) | |
| parent | apply.c:update_pre_post_images(): the preimage can be truncated (diff) | |
| download | tgif-7842c44ccb89dc6c88e67bcc559bc9b38c617e0c.tar.xz | |
Merge branch 'jc/apply-trailing-blank-removal' into maint
"git apply" misbehaved when fixing whitespace breakages by removing
excess trailing blank lines.
* jc/apply-trailing-blank-removal:
apply.c:update_pre_post_images(): the preimage can be truncated
Diffstat (limited to 't/t7607-merge-overwrite.sh')
0 files changed, 0 insertions, 0 deletions