merge script: handle -m --log correctly

diff --git a/submodule.h b/submodule.h
index dbda270873171c41f20c0f07b70773ce67c6a303..6fd3bb40702e5fb905eb4ae519d487e3c9f40073 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -1,6 +1,9 @@
 #ifndef SUBMODULE_H
 #define SUBMODULE_H
 
+struct diff_options;
+
+void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *);
 void show_submodule_summary(FILE *f, const char *path,
                unsigned char one[20], unsigned char two[20],
                unsigned dirty_submodule,