On Sun, Jan 23, 2022 at 12:05 AM René Scharfe <l.s.r@xxxxxx> wrote:
>
> Am 22.01.22 um 22:55 schrieb Elijah Newren via GitGitGadget:
...
> > + /* Check for a request for basic help */
> > + if (argc == 2 && !strcmp(argv[1], "-h"))
> > + usage_with_options(merge_tree_usage, mt_options);
>
> This is unnecessary; parse_options() handles -h already.
>
> > +
> > + /* Parse arguments */
> > + argc = parse_options(argc, argv, prefix, mt_options,
> > + merge_tree_usage, 0);
> > + if (o.real && o.trivial)
> > + die(_("--write-tree and --trivial-merge are incompatible"));
>
> 12909b6b8a (i18n: turn "options are incompatible" into "cannot be used
> together", 2022-01-05) standardized messages of that kind; let's stick
> to that to simplify translation:
>
> die(_("options '%s' and '%s' cannot be used together"),
> "--write-tree", "--trivial-merge");
Ah, thanks for both the pointers; will fix.
