You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@subversion.apache.org by st...@apache.org on 2012/08/05 16:05:40 UTC
svn commit: r1369594 - /subversion/site/publish/docs/release-notes/1.8.html
Author: stsp
Date: Sun Aug 5 14:05:40 2012
New Revision: 1369594
URL: http://svn.apache.org/viewvc?rev=1369594&view=rev
Log:
* publish/docs/release-notes/1.8.html
(file-merge-tool): I've tweaked the output again so update the example
output in the release notes, too.
Modified:
subversion/site/publish/docs/release-notes/1.8.html
Modified: subversion/site/publish/docs/release-notes/1.8.html
URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.8.html?rev=1369594&r1=1369593&r2=1369594&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.8.html (original)
+++ subversion/site/publish/docs/release-notes/1.8.html Sun Aug 5 14:05:40 2012
@@ -460,6 +460,8 @@ Conflict discovered in file 'subversion/
Select: (p) postpone, (df) diff-full, (e) edit, (m) merge,
(mc) mine-conflict, (tc) theirs-conflict,
(s) show all options: m
+Merging 'subversion/svn/file-merge.c'.
+Conflicting section found during merge.
(1) their version (at line 298) |(2) your version (at line 391)
--------------------------------------+--------------------------------------
if (buf->len >= 2 && | if (buf->len > 1)