merge & sequencer: turn "Conflicts:" hint into a comment

diff --git a/submodule.h b/submodule.h
index 550135456833fcf4cdb2a1c093eb2752585318ba..7beec4822b9a35a6286a303f6cf877be1c734568 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -12,6 +12,8 @@ enum {
 };
 
 int is_staging_gitmodules_ok(void);
+int update_path_in_gitmodules(const char *oldpath, const char *newpath);
+int remove_path_from_gitmodules(const char *path);
 void stage_updated_gitmodules(void);
 void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt,
                const char *path);