rebase: use the new git-rebase--preserve-merges.sh

diff --git a/shell.c b/shell.c
index 234b2d4f16fe79e9260c8409bd4d7c964fe27e72..0200d10796c43d6ea1249c314ee158f2b57a481f 100644 (file)
--- a/shell.c
+++ b/shell.c
@@ -1,6 +1,6 @@
 #include "cache.h"
 #include "quote.h"
-#include "exec_cmd.h"
+#include "exec-cmd.h"
 #include "strbuf.h"
 #include "run-command.h"