diff options
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/submodule.h b/submodule.h index 6fd3bb4070..b0a571c7f0 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 |