Menu

Source Commit Log


Commit Date  
[r5152] by lyalyakin

Issue #266.

* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.resolve): minor fix.

2016-05-30 20:05:40 Tree
[r5151] by lyalyakin

Issue #266.

* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.resolve): Tell that the new internal file
merge is available starting with SVN 1.8.

2016-05-30 20:05:18 Tree
[r5150] by lyalyakin

Issue #266.

* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.resolve): Let's tell that the new merge tool
is a *file* merge tool.

2016-05-30 19:58:22 Tree
[r5149] by lyalyakin

Issue #266.

* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.resolve): Let's tell that `m` (merge)
command is the main way to resolve conflicts interactively. Added
<screen> of the internal merge tool, too.

2016-05-30 15:23:14 Tree
[r5148] by lyalyakin

Issue #266.

* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.diff): Update other <screen> outputs for
`svn update` with conflicts to match SVN 1.8.

2016-05-30 12:59:07 Tree
[r5147] by chris-nanteuil

[fr] Chapter 3 : work in progress

2016-05-28 20:47:03 Tree
[r5146] by chris-nanteuil

[fr] Chapter 5 : work in progress.

2016-05-28 17:50:36 Tree
[r5145] by chris-nanteuil

[fr] Chapter 5: translation of first half for version 1.8

2016-05-27 16:54:29 Tree
[r5144] by lyalyakin

Issue #266.

* en/book/ch02-basic-usage.xml
(svn.tour.cycle.resolve.diff): Update <screen> output to match
SVN 1.8.

2016-05-27 11:49:32 Tree
[r5143] by lyalyakin

Issue #266. Discovered during the read-thru process.

* en/book/ch02-basic-usage.xml.
(svn.tour.cycle.resolve): Update <screen> output to match the one
SVN 1.8 produces and add new new (m) option to the list.

2016-05-27 11:21:26 Tree
Older >
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.