summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
Diffstat (limited to 'resolve-undo.h')
-rw-r--r--resolve-undo.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/resolve-undo.h b/resolve-undo.h
index 8458769..4630645 100644
--- a/resolve-undo.h
+++ b/resolve-undo.h
@@ -11,6 +11,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