tests: consolidate CR removal/addition functions

[git.git] / resolve-undo.h

diff --git a/resolve-undo.h b/resolve-undo.h
index 74194d0eba7d6dca49fefff11ed8089b49363650..e4e5c1b1ad5b3fc7d5a2d516ab3ccccb3e88b993 100644 (file)
--- a/resolve-undo.h
+++ b/resolve-undo.h
@@ -10,5 +10,7 @@ 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 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