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

merge-recursive: Update merge_content() call signature

Enable calling merge_content() and providing more information about renames
and D/F conflicts (which we will want to do from process_df_entry()).

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