diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:03:39 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-02-17 10:03:39 -0800 |
| commit | ab2c107eab77a7879574992752a3ac96421bef34 (patch) | |
| tree | eb323695cedf7ce04545e0331b885dc17fa5e2ab /builtin/commit.c | |
| parent | git-cvsserver.perl: fix typo (diff) | |
| parent | merge-file: ensure that conflict sections match eol style (diff) | |
| download | git-ab2c107eab77a7879574992752a3ac96421bef34.tar.gz git-ab2c107eab77a7879574992752a3ac96421bef34.zip | |
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
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions