From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 16 Jul 2014 18:26:04 +0000 (-0700)
Subject: Merge branch 'mk/merge-incomplete-files'
X-Git-Tag: v2.1.0-rc0~39
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2e42338f806c2a79b691215ca3b238ac5beb57df;p=git

Merge branch 'mk/merge-incomplete-files'

Merging changes into a file that ends in an incomplete line made the
last line into a complete one, even when the other branch did not
change anything around the end of file.

* mk/merge-incomplete-files:
  git-merge-file: do not add LF at EOF while applying unrelated change
  t6023-merge-file.sh: fix and mark as broken invalid tests
---

2e42338f806c2a79b691215ca3b238ac5beb57df