diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-07-06 21:45:55 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-24 23:04:41 (GMT) |
| commit | 18bb99342fdb4b612ae45be3fef084ceebd498a0 (patch) | |
| tree | 35f24636a250b4d1990fe95084b82015a338a5e5 /rerere.h | |
| parent | 925d73c4217388838e36bfed85553132c458c7d0 (diff) | |
| download | git-18bb99342fdb4b612ae45be3fef084ceebd498a0.zip git-18bb99342fdb4b612ae45be3fef084ceebd498a0.tar.gz git-18bb99342fdb4b612ae45be3fef084ceebd498a0.tar.bz2 | |
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 <gitster@pobox.com>
Diffstat (limited to 'rerere.h')
| -rw-r--r-- | rerere.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -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 *); |