summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
Diffstat (limited to 'resolve-undo.h')
-rw-r--r--resolve-undo.h16
1 files changed, 16 insertions, 0 deletions
diff --git a/resolve-undo.h b/resolve-undo.h
new file mode 100644
index 0000000000..845876911d
--- /dev/null
+++ b/resolve-undo.h
@@ -0,0 +1,16 @@
+#ifndef RESOLVE_UNDO_H
+#define RESOLVE_UNDO_H
+
+struct resolve_undo_info {
+ unsigned int mode[3];
+ unsigned char sha1[3][20];
+};
+
+extern void record_resolve_undo(struct index_state *, struct cache_entry *);
+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 **);
+
+#endif