The command used was:
svn merge -r28029:28030 svn+ssh://bugman@.../svn/relax/trunk/ .
.....
r28030 | bugman | 2015-10-12 14:13:20 +0200 (Mon, 12 Oct 2015) | 6 lines
Changed paths:
M /trunk/docs/latex/frame_order/theory.tex
M /trunk/docs/latex/relax.tex
Removal of the definition of a fixed-width table column from the LaTeX manual preamble.
This is required as the definition breaks latex2html compatibility, causing a corruption in the
figure numbering resulting in the images in the HTML to be essentially randomised.
.....
