Skip to content
Newer
Older
100644 17 lines (13 sloc) 546 Bytes
cfc5789 @gitster resolve-undo: record resolved conflicts in a new index extension section
gitster authored
1 #ifndef RESOLVE_UNDO_H
2 #define RESOLVE_UNDO_H
3
4 struct resolve_undo_info {
5 unsigned int mode[3];
6 unsigned char sha1[3][20];
7 };
8
9 extern void record_resolve_undo(struct index_state *, struct cache_entry *);
10 extern void resolve_undo_write(struct strbuf *, struct string_list *);
b8bba41 @gitster build: make code "-Wpointer-arith" clean
gitster authored
11 extern struct string_list *resolve_undo_read(const char *, unsigned long);
cfc5789 @gitster resolve-undo: record resolved conflicts in a new index extension section
gitster authored
12 extern void resolve_undo_clear_index(struct index_state *);
4421a82 @gitster resolve-undo: "checkout -m path" uses resolve-undo information
gitster authored
13 extern int unmerge_index_entry_at(struct index_state *, int);
14 extern void unmerge_index(struct index_state *, const char **);
cfc5789 @gitster resolve-undo: record resolved conflicts in a new index extension section
gitster authored
15
16 #endif
Something went wrong with that request. Please try again.