From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 8 Nov 2023 02:04:01 +0000 (+0900)
Subject: Merge branch 'bc/merge-file-object-input'
X-Git-Tag: v2.43.0-rc1~6
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fgit.git;a=commitdiff_plain;h=259e30d2bb4c74d853f5046aeb835c63b4ec88fd

Merge branch 'bc/merge-file-object-input'

"git merge-file" learns a mode to read three contents to be merged
from blob objects.

* bc/merge-file-object-input:
  merge-file: add an option to process object IDs
  git-merge-file doc: drop "-file" from argument placeholders
---

259e30d2bb4c74d853f5046aeb835c63b4ec88fd