[PATCH 0/2] Let merge-file write out conflict markers with correct EOLs

The original patch was sent by Beat Bolli in http://thread.gmane.org/gmane.comp.version-control.git/281600

My suggestion to extend it to respect gitattributes led to changes that broke the original patch.

Since there have been a couple of "What's cooking" mails containing unheard calls for updates on this patch, I took it on myself to fix things.

The most crucial fix is that ll-merge.c is now *untouched*, as it works on blob contents (i.e. LF-only line endings), *not* on file contents from the working directory.

Beat Bolli (1):
  merge-file: consider core.crlf when writing merge markers

Johannes Schindelin (1):
  convert: add a helper to determine the correct EOL for a given path

 builtin/merge-file.c  |  1 +
 convert.c             | 29 +++++++++++++++++++++++++++++
 convert.h             |  2 ++
 t/t6023-merge-file.sh | 14 ++++++++++++++
 xdiff/xdiff.h         |  1 +
 xdiff/xmerge.c        | 29 +++++++++++++++++++----------
 6 files changed, 66 insertions(+), 10 deletions(-)