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 /sigchain.h | |
| 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 'sigchain.h')
0 files changed, 0 insertions, 0 deletions