]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: d0a1cbc 15980de)
Merge branch 'js/xmerge-marker-eol'
authorJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2016 22:20:06 +0000 (14:20 -0800)
committerJunio C Hamano <gitster@pobox.com>
Wed, 10 Feb 2016 22:20:06 +0000 (14:20 -0800)
commit81ad6a9c538bdbc24754cab577d8e480a8c5d012
tree59431849aa8d7dab7f6d925a0e6b9c23369585f9tree | snapshot
parentd0a1cbccab54d828be2d83acc73f38c162962966commit | diff
parent15980deab9f41324aba5cc9536e463d204bafe63commit | diff
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
Unnamed repository; edit this file 'description' to name the repository.