Skip to main content

Browse the archive

Staging
v0.5.1
https://github.com/git/git
23 January 2022, 05:21:09 UTC
Revision a6605d76cdad37ed3c55a7be4d2e0af0f4721bb2 authored by Junio C Hamano on 01 June 2011, 21:11:17 UTC, committed by Junio C Hamano on 01 June 2011, 21:11:17 UTC 
Sync with 1.7.5.4
 
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2 parent s 090a1a5 + e5af0de
Raw File
Tip revision: a6605d76cdad37ed3c55a7be4d2e0af0f4721bb2 authored by Junio C Hamano on 01 June 2011, 21:11:17 UTC
Sync with 1.7.5.4
Tip revision: a6605d7
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