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/04 14:39:20 UTC
svn commit: r1369307 - /subversion/site/publish/docs/release-notes/1.8.html
Author: stsp
Date: Sat Aug 4 12:39:20 2012
New Revision: 1369307
URL: http://svn.apache.org/viewvc?rev=1369307&view=rev
Log:
* publish/docs/release-notes/1.8.html
(file-merge-tool): Show current version of file merge prompt text.
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=1369307&r1=1369306&r2=1369307&view=diff
==============================================================================
--- subversion/site/publish/docs/release-notes/1.8.html (original)
+++ subversion/site/publish/docs/release-notes/1.8.html Sat Aug 4 12:39:20 2012
@@ -473,10 +473,12 @@ Select: (p) postpone, (df) diff-full, (e
| svn_stringbuf_chop(buf, 1);
| }
--------------------------------------+--------------------------------------
-Select: (1) use their version, (2) use your version, (p) postpone,
+Select: (1) use their version, (2) use your version,
(e1) edit their version and use the result,
(e2) edit your version and use the result,
- (eb) edit both versions and use the result:
+ (eb) edit both versions and use the result,
+ (p) postpone this conflicting section leaving conflict markers,
+ (a) abort file merge and return to main menu:
</pre>
</div> <!-- file-merge-tool -->