Merge branch 'sb/object-store-grafts' into sb/object-store-lookup

diff --git a/builtin/merge-tree.c b/builtin/merge-tree.c
index 1b702d44c9fd0155e8117e46974eb2f4468afbee..8a8d579752050487269bcc63aac4713c0b8ebc1e 100644 (file)
--- a/builtin/merge-tree.c
+++ b/builtin/merge-tree.c
@@ -3,7 +3,7 @@
 #include "xdiff-interface.h"
 #include "object-store.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>";