Staging
v0.5.1
v0.5.1
Revision e09e4024a070e666ed40b66442e8151b91d623e4 authored by Junio C Hamano on 11 September 2012, 18:18:48 UTC, committed by Junio C Hamano on 11 September 2012, 18:18:48 UTC
Signed-off-by: Junio C Hamano <gitster@pobox.com>
1 parent 23242a6
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
![swh spinner](/static/img/swh-spinner.gif)
Computing file changes ...