merge-recursive: Fix rename/rename(1to2) resolution for virtual merge base

diff --git a/vcs-svn/repo_tree.c b/vcs-svn/repo_tree.c
index 632dbd87360b0a4a0c2fa2d401a775e9939bab35..a21d89de97404479ecf2ca46824f61acb7af56e6 100644 (file)
--- a/vcs-svn/repo_tree.c
+++ b/vcs-svn/repo_tree.c
@@ -278,8 +278,9 @@ void repo_diff(uint32_t r1, uint32_t r2)
                    repo_commit_root_dir(commit_pointer(r2)));
 }
 
-void repo_commit(uint32_t revision, const char *author, char *log,
-                const char *uuid, const char *url, unsigned long timestamp)
+void repo_commit(uint32_t revision, const char *author,
+               const struct strbuf *log, const char *uuid, const char *url,
+               unsigned long timestamp)
 {
        fast_export_commit(revision, author, log, uuid, url, timestamp);
        dent_commit();