Staging
v0.5.1
https://github.com/git/git
Raw File
Tip revision: ec014eac0e9e6f30cbbca616090fa2ecf74797e7 authored by Junio C Hamano on 24 April 2011, 06:36:32 UTC
Git 1.7.5
Tip revision: ec014ea
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
back to top