Hi. I have noticed that cherry-pick adds trailing newlines when it is not expected to - the change does not contain its addition. Here is the fix for it. The fix is quite debugging-driven, without detailed analysis of how exactly this "add_nl" parameter works in all cases. But it passes all tests. I have added some more where I felt there were not enough. Also I have noticed that some tests in the t6023, which related to the behavior contain a mistake which makes them meaningless. I have fixed it and marked the tests as expected failure, because they are failing after that. Hopely they will be fixed some day. 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 | 72 ++++++++++++++++++++++++++++++++++++++++++++++++--- xdiff/xmerge.c | 4 +-- 2 files changed, 71 insertions(+), 5 deletions(-) -- 2.0.0.526.g5318336 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html