summaryrefslogtreecommitdiff
path: root/src/merge.h
diff options
context:
space:
mode:
Diffstat (limited to 'src/merge.h')
-rw-r--r--src/merge.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/merge.h b/src/merge.h
index d7d1c67b7..b240f6c44 100644
--- a/src/merge.h
+++ b/src/merge.h
@@ -158,4 +158,6 @@ int git_merge__setup(
size_t their_heads_len,
unsigned int flags);
+int git_merge__indexes(git_repository *repo, git_index *index_new);
+
#endif