Staging
v0.5.1
v0.5.1
Revision 304852fc77847e649c746db95e9c4675c03ee567 authored by Junio C Hamano on 01 August 2013, 19:01:53 UTC, committed by Junio C Hamano on 01 August 2013, 19:01:53 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent d50cb75
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 **);
extern void unmerge_marked_index(struct index_state *);
#endif
Computing file changes ...
