diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:26:04 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-07-16 11:26:04 -0700 |
| commit | 2e42338f806c2a79b691215ca3b238ac5beb57df (patch) | |
| tree | d8fa640656260460bcbf399db34cba54bf39e157 /commit.c | |
| parent | Merge branch 'jk/strip-suffix' (diff) | |
| parent | git-merge-file: do not add LF at EOF while applying unrelated change (diff) | |
| download | git-2e42338f806c2a79b691215ca3b238ac5beb57df.tar.gz git-2e42338f806c2a79b691215ca3b238ac5beb57df.zip | |
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
Diffstat (limited to 'commit.c')
0 files changed, 0 insertions, 0 deletions