Merge branch 'gc/branch-recurse-submodules-fix'

[thirdparty/git.git] / builtin / difftool.c

diff --git a/builtin/difftool.c b/builtin/difftool.c
index c79fbbf67e5ee0d4e7d09c7997f1fa04dc1400bc..faa3507369a23d16dfd454aab83c6b813aceb59f 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -732,8 +732,9 @@ int cmd_difftool(int argc, const char **argv, const char *prefix)
        } else if (dir_diff)
                die(_("options '%s' and '%s' cannot be used together"), "--dir-diff", "--no-index");
 
-       if (use_gui_tool + !!difftool_cmd + !!extcmd > 1)
-               die(_("options '%s', '%s', and '%s' cannot be used together"), "--gui", "--tool", "--extcmd");
+       die_for_incompatible_opt3(use_gui_tool, "--gui",
+                                 !!difftool_cmd, "--tool",
+                                 !!extcmd, "--extcmd");
 
        if (use_gui_tool)
                setenv("GIT_MERGETOOL_GUI", "true", 1);