My Various Git Projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6e40947 ba31180)
Merge branch 'mk/merge-incomplete-files'
authorJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:26:04 +0000 (11:26 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 16 Jul 2014 18:26:04 +0000 (11:26 -0700)
commit2e42338f806c2a79b691215ca3b238ac5beb57df
treed8fa640656260460bcbf399db34cba54bf39e157tree | snapshot
parent6e4094731acee5207595a8416d19508107ea475dcommit | diff
parentba311807f8408761a48d4cd596259ca30a4375f2commit | diff
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
The core git plumbing