diff options
| author | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:16:56 +0900 |
|---|---|---|
| committer | DongHun Kwak <dh0128.kwak@samsung.com> | 2021-03-03 15:16:56 +0900 |
| commit | 2d29e070a20e1dc9129eaaa0a308f5db609b2e3a (patch) | |
| tree | 1caf9e1d7dcb6ae65c3431f7094629564bbda048 /resolve-undo.h | |
| parent | c1e56cc9b3fa56810f5af6086bf7487646aa466b (diff) | |
| download | git-2d29e070a20e1dc9129eaaa0a308f5db609b2e3a.tar.gz git-2d29e070a20e1dc9129eaaa0a308f5db609b2e3a.tar.bz2 git-2d29e070a20e1dc9129eaaa0a308f5db609b2e3a.zip | |
Imported Upstream version 2.22.0upstream/2.22.0
Diffstat (limited to 'resolve-undo.h')
| -rw-r--r-- | resolve-undo.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/resolve-undo.h b/resolve-undo.h index fbe348ef..2b3f0f90 100644 --- a/resolve-undo.h +++ b/resolve-undo.h @@ -8,12 +8,12 @@ struct resolve_undo_info { struct object_id oid[3]; }; -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 struct pathspec *); -extern void unmerge_marked_index(struct index_state *); +void record_resolve_undo(struct index_state *, struct cache_entry *); +void resolve_undo_write(struct strbuf *, struct string_list *); +struct string_list *resolve_undo_read(const char *, unsigned long); +void resolve_undo_clear_index(struct index_state *); +int unmerge_index_entry_at(struct index_state *, int); +void unmerge_index(struct index_state *, const struct pathspec *); +void unmerge_marked_index(struct index_state *); #endif |