completion: use __gitcomp_builtin in _git_merge

diff --git a/split-index.h b/split-index.h
index 65c0f09b2bd413e091cc65ef2f0d3a2d92aeb858..df91c1bda8117fe7d0f25a0aaedce79370801ce0 100644 (file)
--- a/split-index.h
+++ b/split-index.h
@@ -33,6 +33,5 @@ void finish_writing_split_index(struct index_state *istate);
 void discard_split_index(struct index_state *istate);
 void add_split_index(struct index_state *istate);
 void remove_split_index(struct index_state *istate);
-void unshare_split_index(struct index_state *istate, int discard);
 
 #endif