Skip to main content

Browse the archive

Staging
v0.5.1
Revision c5e5f6030573b5433284b4e6b4342ab7204f20e1 authored by Junio C Hamano on 28 February 2010, 19:41:24 UTC, committed by Junio C Hamano on 28 February 2010, 19:41:24 UTC 
Git 1.7.0.1
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent c0d3a38
Raw File
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