On Wed, 1 Nov 2023 at 20:24, brian m. carlson
[off-list ref] wrote:

From: "brian m. carlson" <redacted>

git merge-file knows how to merge files on the file system already.  It
would be helpful, however, to allow it to also merge single blobs.
Teach it an `--object-id` option which means that its arguments are
object IDs and not files to allow it to do so.

We handle the empty blob specially since read_mmblob doesn't read it
directly and otherwise users cannot specify an empty ancestor.

Signed-off-by: brian m. carlson <redacted>

Ok, good solution to the misleading paragraph I noticed: dropping it.

 'git merge-file' [-L <current-name> [-L <base-name> [-L <other-name>]]]
        [--ours|--theirs|--union] [-p|--stdout] [-q|--quiet] [--marker-size=<n>]
-       [--[no-]diff3] <current> <base> <other>
+       [--[no-]diff3] [--object-id] <current> <base> <other>

Ok. This is where rebasing onto the new, initial patch could possibly
have tripped up. Of course you didn't. Looks good.


Martin