summaryrefslogtreecommitdiff
path: root/t/t6413-merge-crlf.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2020-08-24 14:54:33 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2020-08-24 14:54:33 -0700
commit51226147d16d59243957cb3bc1b2313f9f740725 (patch)
tree48d83a5d9e35382666920f9926b116c6d0a41251 /t/t6413-merge-crlf.sh
parentMerge branch 'dl/subtree-docs' (diff)
parentpatch-id: ignore newline at end of file in diff_flush_patch_id() (diff)
downloadtgif-51226147d16d59243957cb3bc1b2313f9f740725.tar.xz
Merge branch 'rs/patch-id-with-incomplete-line'
The patch-id computation did not ignore the "incomplete last line" marker like whitespaces. * rs/patch-id-with-incomplete-line: patch-id: ignore newline at end of file in diff_flush_patch_id()
Diffstat (limited to 't/t6413-merge-crlf.sh')
0 files changed, 0 insertions, 0 deletions