merge: update documentation for {merge,diff}.renameLimit

diff --git a/strbuf.h b/strbuf.h
index 652f17392c15993272db5891227ec25b3c78d8bd..c4de5e4588bd4326d363b9387599cd94e29d2f8f 100644 (file)
--- a/strbuf.h
+++ b/strbuf.h
@@ -72,6 +72,12 @@ struct strbuf {
 extern char strbuf_slopbuf[];
 #define STRBUF_INIT  { .alloc = 0, .len = 0, .buf = strbuf_slopbuf }
 
+/*
+ * Predeclare this here, since cache.h includes this file before it defines the
+ * struct.
+ */
+struct object_id;
+
 /**
  * Life Cycle Functions
  * --------------------
@@ -558,7 +564,7 @@ extern void strbuf_list_free(struct strbuf **);
  * the strbuf `sb`.
  */
 extern void strbuf_add_unique_abbrev(struct strbuf *sb,
-                                    const unsigned char *sha1,
+                                    const struct object_id *oid,
                                     int abbrev_len);
 
 /**