Revision 027a3b943b444a3e3a76f9a89803fc10245b858f authored by Junio C Hamano on 26 April 2017, 06:44:07 UTC, committed by Junio C Hamano on 26 April 2017, 06:44:07 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 77b34ea
resolve-undo.h
#ifndef RESOLVE_UNDO_H
#define RESOLVE_UNDO_H
struct resolve_undo_info {
unsigned int mode[3];
unsigned char sha1[3][20];
};
extern void record_resolve_undo(struct index_state *, struct cache_entry *);
extern void resolve_undo_write(struct strbuf *, struct string_list *);
extern struct string_list *resolve_undo_read(const char *, unsigned long);
extern void resolve_undo_clear_index(struct index_state *);
extern int unmerge_index_entry_at(struct index_state *, int);
extern void unmerge_index(struct index_state *, const struct pathspec *);
extern void unmerge_marked_index(struct index_state *);
#endif
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...