diff options
| author | Yannik Tausch <dev@ytausch.de> | 2026-02-07 22:37:48 +0100 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2026-02-07 17:04:26 -0800 |
| commit | 8600b4ec9ef9577408194a99066c356f38139b06 (patch) | |
| tree | 29fd6299e5fdb57c441f8fbf1be3592007eda9f7 /contrib/persistent-https | |
| parent | 3e0db84c88c57e70ac8be8c196dfa92c5d656fbc (diff) | |
| download | git-8600b4ec9ef9577408194a99066c356f38139b06.tar.gz git-8600b4ec9ef9577408194a99066c356f38139b06.zip | |
merge-file: honor merge.conflictStyle outside of a repository
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>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'contrib/persistent-https')
0 files changed, 0 insertions, 0 deletions