| commit | d1115f4ab145e9ed0aef94f5615c237bd7ffb91a | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Jul 2014 22:00:25 +0000 (10 15:00 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 10 Jul 2014 22:00:25 +0000 (10 15:00 -0700) | ||
| tree | 6b365e1861e3fe9a9f7f1cdf72ae1fb8d6d824f8 | treesnapshot (tar.gz zip) |
| parent | e6cfa290a912363ff5b629bc656e1a30e42d91b5 | commitdiff |
| parent | ba311807f8408761a48d4cd596259ca30a4375f2 | commitdiff |
Merge branch 'mk/merge-incomplete-files' into next
* 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
* 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