The command used was:
svn merge -r28025:28026 svn+ssh://bugman@.../svn/relax/trunk/ .
.....
r28026 | bugman | 2015-10-12 11:39:20 +0200 (Mon, 12 Oct 2015) | 7 lines
Changed paths:
M /trunk/docs/latex/frame_order/models.tex
M /trunk/docs/latex/frame_order/pcs_numerical_integration.tex
M /trunk/docs/latex/relax.tex
Removed the newparagraph and newsubparagraph definitions from the LaTeX manual.
These were causing conflicts with latex2html, preventing the HTML version of the manual at
http://www.nmr-relax.com/manual/index.html from being compiled. These definitions are unnecessary
for the current set up of the sectioning in the manual.
.....
