diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-07-06 14:45:55 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-07-24 16:04:41 -0700 |
| commit | 18bb99342fdb4b612ae45be3fef084ceebd498a0 (patch) | |
| tree | 35f24636a250b4d1990fe95084b82015a338a5e5 /builtin/rerere.c | |
| parent | rerere: further clarify do_rerere_one_path() (diff) | |
| download | tgif-18bb99342fdb4b612ae45be3fef084ceebd498a0.tar.xz | |
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.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/builtin/rerere.c b/builtin/rerere.c index 98eb8c5404..81730bb5e6 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); |