difftool: handle unmerged files in dir-diff mode

diff --git a/builtin/diff.c b/builtin/diff.c
index ed0acca91fb870d3f773779b34f4e24c401945e5..52c98a9217c60a60f0012dbdafbb193e78ec8a33 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -341,7 +341,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
        }
        if (no_index)
                /* If this is a no-index diff, just run it and exit there. */
-               diff_no_index(&rev, argc, argv, prefix);
+               diff_no_index(&rev, argc, argv);
 
        /* Otherwise, we are doing the usual "git" diff */
        rev.diffopt.skip_stat_unmatch = !!diff_auto_refresh_index;