svn commit: r251895 - head/contrib/subversion/subversion/libsvn_wc

[Peter Wemm]

Author: peter
Date: Tue Jun 18 04:56:11 2013
New Revision: 251895
URL: http://svnweb.freebsd.org/changeset/base/251895

Log:
  Merge the 3-way merge marker tweak.

Modified:
  head/contrib/subversion/subversion/libsvn_wc/merge.c

Modified: head/contrib/subversion/subversion/libsvn_wc/merge.c
==============================================================================
--- head/contrib/subversion/subversion/libsvn_wc/merge.c	Tue Jun 18 04:50:20 2013	(r251894)
+++ head/contrib/subversion/subversion/libsvn_wc/merge.c	Tue Jun 18 04:56:11 2013	(r251895)
@@ -421,7 +421,7 @@ do_text_merge(svn_boolean_t *contains_co
                                       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));