From: Junio C Hamano <redacted>
Date: Wed, 17 Feb 2016 18:03:39 +0000 (-0800)
Subject: Merge branch 'js/xmerge-marker-eol' into maint
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=ab2c107eab77a7879574992752a3ac96421bef34;p=git.git

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

ab2c107eab77a7879574992752a3ac96421bef34