Skip to main content

Browse the archive

Staging
v0.5.1
Revision 4682693e9ccc04252d0fad6f5627fc056abcdbba authored by Junio C Hamano on 06 September 2010, 07:12:04 UTC, committed by Junio C Hamano on 06 September 2010, 07:12:04 UTC 
Merge branch 'maint'
 
* maint:
  tag.c: whitespace breakages fix
  Fix whitespace issue in object.c
  t5505: add missing &&
2 parent s 02377cf + af24059
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