diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2016-02-10 14:20:06 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-10 14:20:06 -0800 |
| commit | 81ad6a9c538bdbc24754cab577d8e480a8c5d012 (patch) | |
| tree | 59431849aa8d7dab7f6d925a0e6b9c23369585f9 /GIT-VERSION-GEN | |
| parent | Merge branch 'nd/do-not-move-worktree-manually' (diff) | |
| parent | merge-file: ensure that conflict sections match eol style (diff) | |
| download | tgif-81ad6a9c538bdbc24754cab577d8e480a8c5d012.tar.xz | |
Merge branch 'js/xmerge-marker-eol'
The low-level merge machinery has been taught to use CRLF line
termination when inserting conflict markers to merged contents that
are themselves CRLF line-terminated.
* js/xmerge-marker-eol:
merge-file: ensure that conflict sections match eol style
merge-file: let conflict markers match end-of-line style of the context
Diffstat (limited to 'GIT-VERSION-GEN')
0 files changed, 0 insertions, 0 deletions