i18n: refactor "foo and bar are mutually exclusive"

[thirdparty/git.git] / builtin / diff-tree.c

diff --git a/builtin/diff-tree.c b/builtin/diff-tree.c
index f33d30d57bff2ef8923ea9649a5afd4d49eb0574..0e0ac1f1670f3b21f01c4fbbc602c53392331a9c 100644 (file)
--- a/builtin/diff-tree.c
+++ b/builtin/diff-tree.c
@@ -152,7 +152,7 @@ int cmd_diff_tree(int argc, const char **argv, const char *prefix)
        }
 
        if (read_stdin && merge_base)
-               die(_("--stdin and --merge-base are mutually exclusive"));
+               die(_("options '%s' and '%s' cannot be used together"), "--stdin", "--merge-base");
        if (merge_base && opt->pending.nr != 2)
                die(_("--merge-base only works with two commits"));