Merge branch 'tg/t5570-drop-racy-test'

diff --git a/combine-diff.c b/combine-diff.c
index ad7752ea6b7e3173066e346b7dd314e7707f7d8c..a143c006341170fad8c42604eca8f9bbf3226de8 100644 (file)
--- a/combine-diff.c
+++ b/combine-diff.c
@@ -996,7 +996,7 @@ static void show_patch_diff(struct combine_diff_path *elem, int num_parent,
        if (!userdiff)
                userdiff = userdiff_find_by_name("default");
        if (opt->flags.allow_textconv)
-               textconv = userdiff_get_textconv(userdiff);
+               textconv = userdiff_get_textconv(opt->repo, userdiff);
 
        /* Read the result of merge first */
        if (!working_tree_file)