From owner-svn-src-all@FreeBSD.ORG  Tue Jun 18 04:56:12 2013
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by hub.freebsd.org (Postfix) with ESMTP id 33C82E89;
 Tue, 18 Jun 2013 04:56:12 +0000 (UTC)
 (envelope-from peter@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 2619B1849;
 Tue, 18 Jun 2013 04:56:12 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.7/8.14.7) with ESMTP id r5I4uC7r093696;
 Tue, 18 Jun 2013 04:56:12 GMT (envelope-from peter@svn.freebsd.org)
Received: (from peter@localhost)
 by svn.freebsd.org (8.14.7/8.14.5/Submit) id r5I4uCFO093695;
 Tue, 18 Jun 2013 04:56:12 GMT (envelope-from peter@svn.freebsd.org)
Message-Id: <201306180456.r5I4uCFO093695@svn.freebsd.org>
From: Peter Wemm <peter@FreeBSD.org>
Date: Tue, 18 Jun 2013 04:56:12 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r251895 - head/contrib/subversion/subversion/libsvn_wc
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 18 Jun 2013 04:56:12 -0000

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));