From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 01 Nov 2023 23:53:25 GMT
Subject: Re: [PATCH v3 1/2] git-merge-file doc: drop "-file" from argument placeholders
Message-ID: <xmqq8r7howsq.fsf@gitster.g>
In-Reply-To: <20231101192419.794162-2-sandals@crustytoothpaste.net>

"brian m. carlson" <sandals@crustytoothpaste.net> writes:

> From: Martin Ågren <martin.agren@gmail.com>
>
> `git merge-file` takes three positional arguments. Each of them is
> documented as `<foo-file>`. In preparation for teaching this command to
> alternatively take three object IDs, make these placeholders a bit more

Minor nit.  Don't we want to say "three blob object names"?  Unless
we plan to grow this feature into accepting three tree object names,
that is.