diff options
| author | Nguyễn Thái Ngọc Duy <pclouds@gmail.com> | 2013-07-14 15:35:51 +0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-15 10:56:08 -0700 |
| commit | 5ab06518a71a8bd128a2aea38ddb537870d3ea2b (patch) | |
| tree | 4f7b5a7afece7747e97ee537e3e0f4cbd6ece1a2 /resolve-undo.h | |
| parent | 480ca6449ed0981311b8aef2fbaa89d024b881ee (diff) | |
| download | git-5ab06518a71a8bd128a2aea38ddb537870d3ea2b.tar.gz git-5ab06518a71a8bd128a2aea38ddb537870d3ea2b.tar.xz | |
convert unmerge_cache to take struct pathspec
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'resolve-undo.h')
| -rw-r--r-- | resolve-undo.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/resolve-undo.h b/resolve-undo.h index 7a30206aa..46306455e 100644 --- a/resolve-undo.h +++ b/resolve-undo.h @@ -11,7 +11,7 @@ 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 **); +extern void unmerge_index(struct index_state *, const struct pathspec *); extern void unmerge_marked_index(struct index_state *); #endif |