[PATCH v2 0/2] git-merge-file: do not add LF at EOF while applying unrelated change

From: Max Kirillov <max@max630.net>
Date: Jun 28, 2014, 22:04 UTC
Message-ID: <1403993086-15625-1-git-send-email-max@max630.net>

I realized the case when the newline adding can be needed.

The version 2 have this case (union-merge of changes at EOF without LF) fixed, with adding corresponding tests.

Max Kirillov (2):
  t6023-merge-file.sh: fix and mark as broken invalid tests
  git-merge-file: do not add LF at EOF while applying unrelated change

 t/t6023-merge-file.sh | 91 +++++++++++++++++++++++++++++++++++++++++++++++++--
 xdiff/xmerge.c        |  4 +--
 2 files changed, 90 insertions(+), 5 deletions(-)

-- 
2.0.0.526.g5318336