Merge git://git.kernel.org/pub/scm/gitk/gitk
[git/jnareb-git/bp-gitweb.git] / resolve-undo.h
blobe4e5c1b1ad5b3fc7d5a2d516ab3ccccb3e88b993
1 #ifndef RESOLVE_UNDO_H
2 #define RESOLVE_UNDO_H
4 struct resolve_undo_info {
5 unsigned int mode[3];
6 unsigned char sha1[3][20];
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(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 **);
16 #endif