From: Kristoffer Haugsbakk <kristofferhaugsbakk@fastmail.com>
Date: Sat, 07 Feb 2026 21:47:44 GMT
Subject: Re: [PATCH v2] merge-file: honor merge.conflictStyle outside of a repository
Message-ID: <825e7404-f781-4739-a37b-ae3d095fda4d@app.fastmail.com>
In-Reply-To: <3488DCC3-D127-465B-BB95-3D87BB2E48F6@ytausch.de>

On Sat, Feb 7, 2026, at 22:37, Yannik Tausch wrote:
> 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.

>
> 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]