Author: danielsh
Date: Mon Mar 29 19:10:01 2021
New Revision: 1888183
URL: http://svn.apache.org/viewvc?rev=1888183&view=rev
Log:
* docs/release-notes/1.9.html
(#three-way-conflict-markers): Document an alternative way of resolving
conflicts using diff3 conflict markers.
Modified:
subversion/site/publish/docs/release-notes/1.9.html
Modified: subversion/site/publish/docs/release-notes/1.9.html
URL:
http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.9.html?rev=1888183&r1=1888182&r2=1888183&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.9.html (original)
+++ subversion/site/publish/docs/release-notes/1.9.html Mon Mar 29 19:10:01 2021
@@ -1237,6 +1237,11 @@ For example, the following conflict:</p>
Unconflicted lines
</pre>
+<p>Tip: Manually applying to the
+<tt>>>>>>>></tt> hunk the changes that would transform
+the <tt>|||||||</tt> hunk into the <tt><<<<<<<</tt> hunk
+is equivalent, and in real-life conflicts is sometimes easier.</p>
+
<p>The three-way conflict display was already used by property conflicts and
by the interactive conflicts resolver in previous releases of Subversion.</p>
