checkout & worktree: introduce checkout.defaultRemote

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 32736e0b1011f575d2585fd2e012501d807f9e9b..bf01e05808313da20ed73c37d0d150c4ddb45587 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -2,7 +2,7 @@
 #include "tree-walk.h"
 #include "xdiff-interface.h"
 #include "blob.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "merge-blobs.h"
 
 static const char merge_tree_usage[] = "git merge-tree <base-tree> <branch1> <branch2>";