diff options
Diffstat (limited to 'merge-recursive.c')
| -rw-r--r-- | merge-recursive.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/merge-recursive.c b/merge-recursive.c index 2ba43ae84b..c81048d7a7 100644 --- a/merge-recursive.c +++ b/merge-recursive.c @@ -1308,6 +1308,7 @@ int main(int argc, char *argv[]) const char *branch1, *branch2; struct commit *result, *h1, *h2; + git_config(git_default_config); /* core.filemode */ original_index_file = getenv("GIT_INDEX_FILE"); if (!original_index_file) |