Merge branch 'sb/string-list-remove-unused' into maint

diff --git a/resolve-undo.h b/resolve-undo.h
index 845876911db978c6262dacd9aa122ce9d55bf234..fbe348efac929f9202c4f3e81d962e84157b9082 100644 (file)
--- a/resolve-undo.h
+++ b/resolve-undo.h
@@ -1,9 +1,11 @@
 #ifndef RESOLVE_UNDO_H
 #define RESOLVE_UNDO_H
 
+#include "cache.h"
+
 struct resolve_undo_info {
        unsigned int mode[3];
-       unsigned char sha1[3][20];
+       struct object_id oid[3];
 };
 
 extern void record_resolve_undo(struct index_state *, struct cache_entry *);
@@ -11,6 +13,7 @@ extern void resolve_undo_write(struct strbuf *, struct string_list *);
 extern struct string_list *resolve_undo_read(const char *, unsigned long);
 extern void resolve_undo_clear_index(struct index_state *);
 extern int unmerge_index_entry_at(struct index_state *, int);
-extern void unmerge_index(struct index_state *, const char **);
+extern void unmerge_index(struct index_state *, const struct pathspec *);
+extern void unmerge_marked_index(struct index_state *);
 
 #endif