Hi brian

Thanks for the re-roll, this version looks good to me

Phillip

On 30/10/2023 16:26, brian m. carlson wrote:

This series introduces an --object-id option to git merge-file such
that, instead of reading and writing from files on the system, it reads
from and writes to the object store using blobs.

Changes from v1:
* Improve error handling
* Re-add `-p` argument for documentation

brian m. carlson (1):
   merge-file: add an option to process object IDs

  Documentation/git-merge-file.txt | 20 +++++++++++
  builtin/merge-file.c             | 62 +++++++++++++++++++++++---------
  t/t6403-merge-file.sh            | 58 ++++++++++++++++++++++++++++++
  3 files changed, 124 insertions(+), 16 deletions(-)