From: Elijah Newren <newren@gmail.com>
Date: Mon, 20 Sep 2010 08:28:57 +0000 (-0600)
Subject: merge-recursive: Update conflict_rename_rename_1to2() call signature
X-Git-Tag: v1.7.4-rc0~101^2~15
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/36de17048aaa3c3011c8b4ee1f89ee65b7ad2f99?hp=36de17048aaa3c3011c8b4ee1f89ee65b7ad2f99

merge-recursive: Update conflict_rename_rename_1to2() call signature

To facilitate having this function called later using information stored
in a rename_df_conflict_info struct, accept a diff_filepair instead of a
rename.

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