From c8bae7493d2f2910b57f13ded012e86bdcfb0532 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 7 Apr 2024 16:47:53 +0200 Subject: Adding upstream version 1:2.39.2. Signed-off-by: Daniel Baumann --- resolve-undo.h | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 resolve-undo.h (limited to 'resolve-undo.h') diff --git a/resolve-undo.h b/resolve-undo.h new file mode 100644 index 0000000..2b3f0f9 --- /dev/null +++ b/resolve-undo.h @@ -0,0 +1,19 @@ +#ifndef RESOLVE_UNDO_H +#define RESOLVE_UNDO_H + +#include "cache.h" + +struct resolve_undo_info { + unsigned int mode[3]; + struct object_id oid[3]; +}; + +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 *); + +#endif -- cgit v1.2.3