The command used was:
svn merge -r28027:28028 svn+ssh://bugman@.../svn/relax/trunk/ .
.....
r28028 | bugman | 2015-10-12 11:45:30 +0200 (Mon, 12 Oct 2015) | 7 lines
Changed paths:
M /trunk/docs/latex/frame_order/models.tex
Modified the short captions in the new frame models chapter of the manual.
The runic Daeg character has been replaced simply by 'Daeg'. This is due to incompatibilities with
latex2html which prevents the HTML manual at http://www.nmr-relax.com/manual/index.html from being
compiled.
.....
