Skip to main content

Browse the archive

https://github.com/git/git
31 May 2024, 23:06:24 UTC
Revision b1af9630d758e1728fc0008b3f18d90d8f87f4c5 authored by Junio C Hamano on 05 December 2011, 23:07:54 UTC, committed by Junio C Hamano on 05 December 2011, 23:07:54 UTC 
Merge branch 'maint-1.7.7' into maint
 
* maint-1.7.7:
  stripspace: fix outdated comment
  Add MYMETA.yml to perl/.gitignore
2 parent s eb3b8d7 + c34ba99
Raw File
Tip revision: b1af9630d758e1728fc0008b3f18d90d8f87f4c5 authored by Junio C Hamano on 05 December 2011, 23:07:54 UTC
Merge branch 'maint-1.7.7' into maint
Tip revision: b1af963
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