convert_to_git(): safe_crlf/checksafe becomes int conv_flags

[thirdparty/git.git] / combine-diff.c

diff --git a/combine-diff.c b/combine-diff.c
index 2505de119a2be37e9dfb313a2e44db68595ad13f..19f30c33539f69c773c7b104be8355d4e7e4fcdd 100644 (file)
--- 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;