diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-02-17 10:15:20 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-17 10:15:21 -0800 |
| commit | 38459ee6afa0ce8aef81f5022aa9bd9260e0fdd7 (patch) | |
| tree | ec502044a9e8a41fcfee5363ae422b362a22f9d3 /mergetools/meld | |
| parent | Merge branch 'ak/add-i-empty-candidates' (diff) | |
| parent | apply: count the size of postimage correctly (diff) | |
| download | tgif-38459ee6afa0ce8aef81f5022aa9bd9260e0fdd7.tar.xz | |
Merge branch 'jc/apply-ws-fix-expands'
"git apply --whitespace=fix" used to under-allocate the memory
when the fix resulted in a longer text than the original patch.
* jc/apply-ws-fix-expands:
apply: count the size of postimage correctly
apply: make update_pre_post_images() sanity check the given postlen
apply.c: typofix
Diffstat (limited to 'mergetools/meld')
0 files changed, 0 insertions, 0 deletions