From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Dec 2021 22:26:42 GMT
Subject: Re: [PATCH v3 02/11] i18n: refactor "%s, %s and %s are mutually exclusive"
Message-ID: <xmqqfsq9pw4d.fsf@gitster.g>
In-Reply-To: <4accf1629e55ae621053f27994ebc4eb59d6f0ff.1640804107.git.gitgitgadget@gmail.com>

"Jean-Noël Avila via GitGitGadget"  <gitgitgadget@gmail.com> writes:

>  	if (use_stdout + rev.diffopt.close_file + !!output_directory > 1)
> -		die(_("--stdout, --output, and --output-directory are mutually exclusive"));
> +		die(_("options '%s', '%s' and '%s' cannot be used together"), "--stdout", "--output", "--output-directory");

We probably want to preserve the Oxford comma here, and unify the
ones that didn't use Oxford comma to use it.