Merge branch 'ab/ambiguous-object-name'

[thirdparty/git.git] / range-diff.c

diff --git a/range-diff.c b/range-diff.c
index cac89a2f4f2c8d4c6471f0a55bc725cf17a2d9b9..30a4de5c2d8a1447dc23d6b5d61278df0f796bbb 100644 (file)
--- a/range-diff.c
+++ b/range-diff.c
@@ -556,7 +556,7 @@ int show_range_diff(const char *range1, const char *range2,
        struct string_list branch2 = STRING_LIST_INIT_DUP;
 
        if (range_diff_opts->left_only && range_diff_opts->right_only)
-               res = error(_("--left-only and --right-only are mutually exclusive"));
+               res = error(_("options '%s' and '%s' cannot be used together"), "--left-only", "--right-only");
 
        if (!res && read_patches(range1, &branch1, range_diff_opts->other_arg))
                res = error(_("could not parse log for '%s'"), range1);