diff options
author | Junio C Hamano <gitster@pobox.com> | 2020-11-09 14:06:26 -0800 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-11-09 14:06:26 -0800 |
commit | 4c7eb63d2d4ad6d88a336357baaa6a934b604eda (patch) | |
tree | 0cfe6db723707b9930bbbf48c999aa4be8c00078 /mergetools/winmerge | |
parent | Merge branch 'jk/checkout-index-errors' (diff) | |
parent | log, show: add tests for messages containing CRLF (diff) | |
download | tgif-4c7eb63d2d4ad6d88a336357baaa6a934b604eda.tar.xz |
Merge branch 'pb/ref-filter-with-crlf'
A commit and tag object may have CR at the end of each and
every line (you can create such an object with hash-object or
using --cleanup=verbatim to decline the default clean-up
action), but it would make it impossible to have a blank line
to separate the title from the body of the message. Be lenient
and accept a line with lone CR on it as a blank line, too.
* pb/ref-filter-with-crlf:
log, show: add tests for messages containing CRLF
ref-filter: handle CRLF at end-of-line more gracefully
Diffstat (limited to 'mergetools/winmerge')
0 files changed, 0 insertions, 0 deletions