]> git.ipfire.org Git - thirdparty/git.git/commit
merge-recursive: rename 'mrtree' to 'result_tree', for clarity
authorElijah Newren <newren@gmail.com>
Sat, 17 Aug 2019 18:41:35 +0000 (11:41 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 19 Aug 2019 17:08:04 +0000 (10:08 -0700)
commitbab56877e04efcf1bf9154398131dd57d73725d4
treeae709927e5f6aadc585b1871a9ff621d28c0385b
parentff1bfa2cd5693900a84750dc47cda3cee3cf6ba7
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>
merge-recursive.c