editor: move editor-related functions and declarations into common file

[thirdparty/git.git] / builtin / merge.c

diff --git a/builtin/merge.c b/builtin/merge.c
index 693f185d4d38f1f0f903ae0ba47c15a073732193..8da3e46abb0fdc692faac47e0b0deb9e13fe4194 100644 (file)
--- a/builtin/merge.c
+++ b/builtin/merge.c
@@ -12,6 +12,7 @@
 #include "advice.h"
 #include "alloc.h"
 #include "config.h"
+#include "editor.h"
 #include "environment.h"
 #include "gettext.h"
 #include "hex.h"