diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-02-18 11:45:01 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-02-18 11:45:01 -0800 |
| commit | de15bdb0583a1a65bf1bab47b7bec9bdc03f727a (patch) | |
| tree | 36d6f1b6626f57b3a0fcfd93958e29b2aa4fcf4d /mergetools | |
| parent | Merge branch 'jk/pack-bitmap' (diff) | |
| parent | config_buf_ungetc: warn when pushing back a random character (diff) | |
| download | tgif-de15bdb0583a1a65bf1bab47b7bec9bdc03f727a.tar.xz | |
Merge branch 'jk/config-no-ungetc-eof'
Reading configuration from a blob object, when it ends with a lone
CR, use to confuse the configuration parser.
* jk/config-no-ungetc-eof:
config_buf_ungetc: warn when pushing back a random character
config: do not ungetc EOF
Diffstat (limited to 'mergetools')
0 files changed, 0 insertions, 0 deletions