diff options
Diffstat (limited to 'resolve-undo.h')
| -rw-r--r-- | resolve-undo.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/resolve-undo.h b/resolve-undo.h index c5deafc92f..f3f8462751 100644 --- a/resolve-undo.h +++ b/resolve-undo.h @@ -17,8 +17,7 @@ void record_resolve_undo(struct index_state *, struct cache_entry *); void resolve_undo_write(struct strbuf *, struct string_list *); struct string_list *resolve_undo_read(const char *, unsigned long); void resolve_undo_clear_index(struct index_state *); -int unmerge_index_entry_at(struct index_state *, int); -void unmerge_index(struct index_state *, const struct pathspec *); -void unmerge_marked_index(struct index_state *); +int unmerge_index_entry(struct index_state *, const char *, struct resolve_undo_info *, unsigned); +void unmerge_index(struct index_state *, const struct pathspec *, unsigned); #endif |