path: root/devel/subversion/files/extra-patch-3way-conflict-markers

diff -ruN subversion/libsvn_wc/merge.c subversion/libsvn_wc/merge.c
--- subversion/libsvn_wc/merge.c	2011-08-06 19:15:44.000000000 +0400
+++ subversion/libsvn_wc/merge.c	2011-09-07 21:47:19.000000000 +0400
@@ -413,7 +413,7 @@
                                       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));