X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=submodule.h;h=80e04f3c8cfe9a49865ef54f61efaa3bc67dca5c;hb=e5b8eebc03f80bc21877494ae2ac0c2b63a1b83b;hp=799c22d6c6a459756983420960bc099da20336b3;hpb=2c5c66be6ecdd10f5a88c3548a1494bf9edf483a;p=git.git

diff --git a/submodule.h b/submodule.h
index 799c22d6c..80e04f3c8 100644
--- a/submodule.h
+++ b/submodule.h
@@ -28,7 +28,7 @@ int fetch_populated_submodules(int num_options, const char **options,
 			       int quiet);
 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]);
+		    const unsigned char a[20], const unsigned char b[20], int search);
 int check_submodule_needs_pushing(unsigned char new_sha1[20], const char *remotes_name);
 
 #endif