| Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 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 *); |
| Junio C Hamano | b8bba41 | 2010-02-01 22:04:03 -0800 | [diff] [blame] | 11 | extern struct string_list *resolve_undo_read(const char *, unsigned long); |
| Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 12 | extern void resolve_undo_clear_index(struct index_state *); |
| Junio C Hamano | 4421a82 | 2009-12-25 11:57:11 -0800 | [diff] [blame] | 13 | extern int unmerge_index_entry_at(struct index_state *, int); |
| 14 | extern void unmerge_index(struct index_state *, const char **); |
| Junio C Hamano | cfc5789 | 2009-12-25 00:30:51 -0800 | [diff] [blame] | 15 | |
| 16 | #endif |
