Re: [PATCH v2] merge-file: honor merge.conflictStyle outside of a repository
On Sat, Feb 7, 2026, at 22:37, Yannik Tausch wrote:
Show 11 quoted lines
> When running outside a repository, git merge-file ignores the
> merge.conflictStyle configuration variable entirely. Since the
> function receives `repo` from the caller (which is NULL outside a
> repository), and repo_config() falls back to reading system and user
> configuration when passed NULL, pass `repo` to repo_config()
> unconditionally.
>
> Also document that merge.conflictStyle is honored.
>
> Signed-off-by: Yannik Tausch <dev@ytausch.de>
> ---
This looks good to me. Based on my previous feedback.
Show 6 quoted lines
>
> Notes:
> Changes since v1:
> - Use repo parameter directly with repo_config() (Junio)
> - Fix AsciiDoc continuation, rename test files, break long
> lines (Kristoffer)
Nice and tidy change notes/changelog.
>[snip]