From: Elijah Newren <newren@gmail.com>
Date: Fri, 5 Apr 2019 15:00:21 +0000 (-0700)
Subject: merge-recursive: cleanup handle_rename_* function signatures
X-Git-Tag: v2.22.0-rc0~34^2~5
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e2d563dfa9951683a118e728dee99bd07a90e52d?ds=inline;hp=e2d563dfa9951683a118e728dee99bd07a90e52d

merge-recursive: cleanup handle_rename_* function signatures

Instead of passing various bits and pieces of 'ci', just pass it
directly.

Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---