X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=submodule.h;fp=submodule.h;h=b0a571c7f0b454ab0b5d7736aa561baec467af89;hb=68d03e4a6e448aa557f52adef92595ac4d6cd4bd;hp=6fd3bb40702e5fb905eb4ae519d487e3c9f40073;hpb=9ef6aeb09ffe0650ca86dca53de93fd85333b02d;p=git.git

diff --git a/submodule.h b/submodule.h
index 6fd3bb407..b0a571c7f 100644
--- a/submodule.h
+++ b/submodule.h
@@ -9,5 +9,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