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

diff --cc builtin/merge-tree.c
index aa8040c2a6a6ffa1ae03118910da61f4729fd11a,d401e74698b1194a30dee9b4a2034ea576b66f94..b8f8a8b5d9fb15e9f1225b3650faa7124c869877
--- 1/builtin/merge-tree.c
--- 2/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';