From 18bb99342fdb4b612ae45be3fef084ceebd498a0 Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Mon, 6 Jul 2015 14:45:55 -0700 Subject: rerere: call conflict-ids IDs Most places we call conflict IDs "name" and some others we call them "hex"; update all of them to "id". Signed-off-by: Junio C Hamano --- rerere.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'rerere.h') diff --git a/rerere.h b/rerere.h index 2956c2edf..f998ebae6 100644 --- a/rerere.h +++ b/rerere.h @@ -17,7 +17,7 @@ extern void *RERERE_RESOLVED; extern int setup_rerere(struct string_list *, int); extern int rerere(int); -extern const char *rerere_path(const char *hex, const char *file); +extern const char *rerere_path(const char *id, const char *file); extern int rerere_forget(struct pathspec *); extern int rerere_remaining(struct string_list *); extern void rerere_clear(struct string_list *); -- cgit v1.2.1