From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 21 Jun 2022 16:55:52 GMT
Subject: Re: [PATCH 1/2] combine-diff: abort if --ignore-matching-lines is given
Message-ID: <xmqqsfnygdlz.fsf@gitster.g>
In-Reply-To: <95d7609e-4cb5-c87e-0120-144f1f094241@web.de>

René Scharfe <l.s.r@web.de> writes:

>>> +	if (opt->ignore_regex_nr)
>>> +		die("combined diff and '%s' cannot be used together",
>>> +		    "--ignore-matching-lines");
>>
>> "X cannot be used together _with_ Y" perhaps?
>
> Not sure, but that type of message was recently unified (most common
> case: "options '%s' and '%s' cannot be used together") and "with" is
> only used in an untranslated BUG:

Ah, sorry, I completely misread the original as "combined diff
cannot be used together with ignore-matching-lines".

Sorry for the noise.