From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Feb 2016 22:20:06 +0000 (-0800)
Subject: Merge branch 'js/xmerge-marker-eol'
X-Git-Tag: v2.8.0-rc0~64
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=81ad6a9c538bdbc24754cab577d8e480a8c5d012;p=git

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
---

81ad6a9c538bdbc24754cab577d8e480a8c5d012