diff --git a/contrib/subversion/subversion/libsvn_wc/merge.c b/contrib/subversion/subversion/libsvn_wc/merge.c
index 7cff3e4bd225..e01c471ca309 100644
--- a/contrib/subversion/subversion/libsvn_wc/merge.c
+++ b/contrib/subversion/subversion/libsvn_wc/merge.c
@@ -421,7 +421,7 @@ do_text_merge(svn_boolean_t *contains_conflicts,
                                       target_marker,
                                       right_marker,
                                       "=======", /* separator */
-                                      svn_diff_conflict_display_modified_latest,
+                                      svn_diff_conflict_display_modified_original_latest,
                                       pool));
   SVN_ERR(svn_stream_close(ostream));