The command used was:
svn merge -r25625:25626 svn+ssh://bugman@.../svn/relax/trunk .
.....
r25626 | bugman | 2014-09-04 15:35:36 +0200 (Thu, 04 Sep 2014) | 6 lines
Changed paths:
M /trunk/user_functions/__init__.py
Created the user_functions.uf_translation_table list.
The elements of this list are the names of user functions before and after a renaming. The list is
provided for backwards compatibility for relax scripts, though it is not used yet.
.....