| commit | ab2c107eab77a7879574992752a3ac96421bef34 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Feb 2016 18:03:39 +0000 (17 10:03 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 17 Feb 2016 18:03:39 +0000 (17 10:03 -0800) | ||
| tree | eb323695cedf7ce04545e0331b885dc17fa5e2ab | treesnapshot (tar.gz zip) |
| parent | 527d4a638e330f4efe459442bbfb0799d29fd73a | commitdiff |
| parent | 15980deab9f41324aba5cc9536e463d204bafe63 | commitdiff |
Merge branch 'js/xmerge-marker-eol' into maint
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
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