X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=submodule.h;h=386f410a66d9c431a61c0e26c773f1b3452f0d09;hb=5501bf854ce6a3847ef0de6f6aa63f6b93e82b67;hp=8ac4037b56210d54616dfa68655722b246c26f1b;hpb=f9c33605700e37b75279ed6ce4bffaad3eb0cf10;p=git.git

diff --git a/submodule.h b/submodule.h
index 8ac4037b5..386f410a6 100644
--- 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