|
Packit |
4511e4 |
#ifndef RESOLVE_UNDO_H
|
|
Packit |
4511e4 |
#define RESOLVE_UNDO_H
|
|
Packit |
4511e4 |
|
|
Packit |
4511e4 |
struct resolve_undo_info {
|
|
Packit |
4511e4 |
unsigned int mode[3];
|
|
Packit |
4511e4 |
struct object_id oid[3];
|
|
Packit |
4511e4 |
};
|
|
Packit |
4511e4 |
|
|
Packit |
4511e4 |
extern void record_resolve_undo(struct index_state *, struct cache_entry *);
|
|
Packit |
4511e4 |
extern void resolve_undo_write(struct strbuf *, struct string_list *);
|
|
Packit |
4511e4 |
extern struct string_list *resolve_undo_read(const char *, unsigned long);
|
|
Packit |
4511e4 |
extern void resolve_undo_clear_index(struct index_state *);
|
|
Packit |
4511e4 |
extern int unmerge_index_entry_at(struct index_state *, int);
|
|
Packit |
4511e4 |
extern void unmerge_index(struct index_state *, const struct pathspec *);
|
|
Packit |
4511e4 |
extern void unmerge_marked_index(struct index_state *);
|
|
Packit |
4511e4 |
|
|
Packit |
4511e4 |
#endif
|