Merge branch 'da/difftool' into maint

diff --git a/builtin/diff.c b/builtin/diff.c
index 52c98a9217c60a60f0012dbdafbb193e78ec8a33..d6b8f9834d8f1ef26da5994a24db73c1b0b83221 100644 (file)
--- a/builtin/diff.c
+++ b/builtin/diff.c
@@ -319,6 +319,7 @@ int cmd_diff(int argc, const char **argv, const char *prefix)
        if (!no_index)
                gitmodules_config();
        git_config(git_diff_ui_config, NULL);
+       precompose_argv(argc, argv);
 
        init_revisions(&rev, prefix);