git-p4: auto-size the block
[git.git] / resolve-undo.h
blob87291904bd34e0e7f3a3601b6742f5345391824d
1 #ifndef RESOLVE_UNDO_H
2 #define RESOLVE_UNDO_H
4 struct resolve_undo_info {
5 unsigned int mode[3];
6 struct object_id oid[3];
7 };
9 extern void record_resolve_undo(struct index_state *, struct cache_entry *);
10 extern void resolve_undo_write(struct strbuf *, struct string_list *);
11 extern struct string_list *resolve_undo_read(const char *, unsigned long);
12 extern void resolve_undo_clear_index(struct index_state *);
13 extern int unmerge_index_entry_at(struct index_state *, int);
14 extern void unmerge_index(struct index_state *, const struct pathspec *);
15 extern void unmerge_marked_index(struct index_state *);
17 #endif