summaryrefslogtreecommitdiff
path: root/t/t5515
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2018-06-09 21:16:16 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-06-12 10:22:57 -0700
commit5b26c3c941d3c7cd96be668e1778ba22cc4829d5 (patch)
treeedb65b450540c073dd69e1c33d9cedaf1f576921 /t/t5515
parentmerge-recursive: rename conflict_rename_*() family of functions (diff)
downloadtgif-5b26c3c941d3c7cd96be668e1778ba22cc4829d5.tar.xz
merge-recursive: add pointer about unduly complex looking code
handle_change_delete() has a block of code displaying one of four nearly identical messages. Each contains about half a dozen variable interpolations, which use nearly identical variables as well. Someone trying to parse this may be slowed down trying to parse the differences and why they are here; help them out by adding a comment explaining the differences. Further, point out that this code structure isn't collapsed into something more concise and readable for the programmer, because we want to keep full messages intact in order to make translators' jobs much easier. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t5515')
0 files changed, 0 insertions, 0 deletions