The command used was:
svn merge -r28031:28032 svn+ssh://bugman@.../svn/relax/trunk/ .
.....
r28032 | bugman | 2015-10-12 16:12:13 +0200 (Mon, 12 Oct 2015) | 6 lines
Changed paths:
M /trunk/docs/latex/frame_order/models.tex
M /trunk/docs/latex/relax.tex
Removal of the accents package to allow the HTML manual to be compiled.
The 'accents' LaTeX package is not compatible with latex2html, so the easiest fix is to eliminate
the package.
.....