completion: use __gitcomp_builtin in _git_merge

diff --git a/commit.h b/commit.h
index 8c68ca1a5a18721538bb44fe37cdf94223f2a5b5..425f4027752fb47190a53ddc72a64ebf9d928633 100644 (file)
--- a/commit.h
+++ b/commit.h
@@ -140,7 +140,6 @@ struct commit *pop_commit(struct commit_list **stack);
 
 void clear_commit_marks(struct commit *commit, unsigned int mark);
 void clear_commit_marks_many(int nr, struct commit **commit, unsigned int mark);
-void clear_commit_marks_for_object_array(struct object_array *a, unsigned mark);
 
 
 enum rev_sort_order {