X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=resolve-undo.h;h=845876911db978c6262dacd9aa122ce9d55bf234;hb=8718e875080767f2c8d06c55c3fb5a6dddf0e5a0;hp=74194d0eba7d6dca49fefff11ed8089b49363650;hpb=cfc5789ada444423232fa1533f401b5972eb3f6c;p=git.git

diff --git a/resolve-undo.h b/resolve-undo.h
index 74194d0eb..845876911 100644
--- a/resolve-undo.h
+++ b/resolve-undo.h
@@ -8,7 +8,9 @@ struct resolve_undo_info {
 
 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(void *, unsigned long);
+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