summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Elijah Newren <newren@gmail.com>2019-08-17 11:41:35 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2019-08-19 10:08:04 -0700
commitbab56877e04efcf1bf9154398131dd57d73725d4 (patch)
treeae709927e5f6aadc585b1871a9ff621d28c0385b /merge-recursive.h
parentmerge-recursive: use common name for ancestors/common/base_list (diff)
downloadtgif-bab56877e04efcf1bf9154398131dd57d73725d4.tar.xz
merge-recursive: rename 'mrtree' to 'result_tree', for clarity
It is not at all clear what 'mr' was supposed to stand for, at least not to me. Pick a clearer name for this variable. Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions