diff/log -G<pattern>: tests

diff --git a/submodule.h b/submodule.h
index 8ac4037b56210d54616dfa68655722b246c26f1b..386f410a66d9c431a61c0e26c773f1b3452f0d09 100644 (file)
--- a/submodule.h
+++ b/submodule.h
@@ -13,5 +13,7 @@ void show_submodule_summary(FILE *f, const char *path,
                unsigned dirty_submodule,
                const char *del, const char *add, const char *reset);
 unsigned is_submodule_modified(const char *path, int ignore_untracked);
+int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20],
+                   const unsigned char a[20], const unsigned char b[20]);
 
 #endif