]>
git.ipfire.org Git - thirdparty/git.git/blob - resolve-undo.h
e4e5c1b1ad5b3fc7d5a2d516ab3ccccb3e88b993
4 struct resolve_undo_info
{
6 unsigned char sha1
[3][20];
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(void *, 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 char **);