summaryrefslogtreecommitdiff
path: root/resolve-undo.h
diff options
context:
space:
mode:
authorNguyễn Thái Ngọc Duy <pclouds@gmail.com>2013-07-14 08:35:51 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-15 17:56:08 (GMT)
commit5ab06518a71a8bd128a2aea38ddb537870d3ea2b (patch)
tree4f7b5a7afece7747e97ee537e3e0f4cbd6ece1a2 /resolve-undo.h
parent480ca6449ed0981311b8aef2fbaa89d024b881ee (diff)
downloadgit-5ab06518a71a8bd128a2aea38ddb537870d3ea2b.zip
git-5ab06518a71a8bd128a2aea38ddb537870d3ea2b.tar.gz
git-5ab06518a71a8bd128a2aea38ddb537870d3ea2b.tar.bz2
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.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/resolve-undo.h b/resolve-undo.h
index 7a30206..4630645 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