Merge branch 'ls/checkout-encoding'

diff --git a/builtin/difftool.c b/builtin/difftool.c
index ee8dce019e1ca04111de185b5f47c12076b32a0c..aad0e073ee61648a73843ceddffbab6047c9721b 100644 (file)
--- a/builtin/difftool.c
+++ b/builtin/difftool.c
@@ -15,7 +15,7 @@
 #include "config.h"
 #include "builtin.h"
 #include "run-command.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "parse-options.h"
 #include "argv-array.h"
 #include "strbuf.h"