[thirdparty/git.git] / 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 char **);

#endif
Commit	Line	Data
	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 );
	11	extern struct string_list resolve_undo_read(const char , 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 *);
	15
	16	#endif