From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 17 Feb 2026 21:30:41 +0000 (-0800)
Subject: Merge branch 'yt/merge-file-outside-a-repository'
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=73f29c8ca98c34283599889a91559e35b015182c;p=thirdparty%2Fgit.git

Merge branch 'yt/merge-file-outside-a-repository'

"git merge-file" can be run outside a repository, but it ignored
all configuration, even the per-user ones.  The command now uses
available configuration files to find its customization.

* yt/merge-file-outside-a-repository:
  merge-file: honor merge.conflictStyle outside of a repository
---

73f29c8ca98c34283599889a91559e35b015182c