Mercurial > repo

view git-master/resolve-undo.h @ 2765:0e687eac0f29

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
<ThatOtherPerson> mv DCPUToolBot-master d
author HackBot
date Mon, 22 Apr 2013 15:40:20 +0000
parents e59711901a63
children
line wrap: on
line source

#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