From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 15 May 2023 20:59:06 +0000 (-0700)
Subject: Merge branch 'ds/merge-tree-use-config'
X-Git-Tag: v2.41.0-rc0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=80754c5cc05955dd0159fa40d7b82b2802a4deba;p=thirdparty%2Fgit.git

Merge branch 'ds/merge-tree-use-config'

Allow git forges to disable replace-refs feature while running "git
merge-tree".

* ds/merge-tree-use-config:
  merge-tree: load default git config
---

80754c5cc05955dd0159fa40d7b82b2802a4deba
diff --cc builtin/merge-tree.c
index aa8040c2a6,d401e74698..b8f8a8b5d9
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@@ -16,7 -13,7 +16,8 @@@
  #include "exec-cmd.h"
  #include "merge-blobs.h"
  #include "quote.h"
 +#include "tree.h"
+ #include "config.h"
  
  static int line_termination = '\n';