summaryrefslogtreecommitdiff
path: root/builtin/rerere.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2015-07-06 21:45:55 (GMT)
committerJunio C Hamano <gitster@pobox.com>2015-07-24 23:04:41 (GMT)
commit18bb99342fdb4b612ae45be3fef084ceebd498a0 (patch)
tree35f24636a250b4d1990fe95084b82015a338a5e5 /builtin/rerere.c
parent925d73c4217388838e36bfed85553132c458c7d0 (diff)
downloadgit-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 'builtin/rerere.c')
-rw-r--r--builtin/rerere.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rerere.c b/builtin/rerere.c
index 98eb8c5..81730bb 100644
--- a/builtin/rerere.c
+++ b/builtin/rerere.c
@@ -103,8 +103,8 @@ int cmd_rerere(int argc, const char **argv, const char *prefix)
} else if (!strcmp(argv[0], "diff"))
for (i = 0; i < merge_rr.nr; i++) {
const char *path = merge_rr.items[i].string;
- const char *name = (const char *)merge_rr.items[i].util;
- diff_two(rerere_path(name, "preimage"), path, path, path);
+ const char *id = (const char *)merge_rr.items[i].util;
+ diff_two(rerere_path(id, "preimage"), path, path, path);
}
else
usage_with_options(rerere_usage, options);