X-Git-Url: http://git.ipfire.org/?a=blobdiff_plain;f=combine-diff.c;h=19f30c33539f69c773c7b104be8355d4e7e4fcdd;hb=8462ff43e42ab67cecd16fdfb59451a53cc8a945;hp=2505de119a2be37e9dfb313a2e44db68595ad13f;hpb=12e87e29ce60120a711b367b385b91fdc1c35a57;p=thirdparty%2Fgit.git

diff --git a/combine-diff.c b/combine-diff.c
index 2505de119a..19f30c3353 100644
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -1053,7 +1053,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
 			if (is_file) {
 				struct strbuf buf = STRBUF_INIT;
 
-				if (convert_to_git(&the_index, elem->path, result, len, &buf, safe_crlf)) {
+				if (convert_to_git(&the_index, elem->path, result, len, &buf, global_conv_flags_eol)) {
 					free(result);
 					result = strbuf_detach(&buf, &len);
 					result_size = len;