The command used was:
svn merge -r14393:14394 svn+ssh://bugman@.../svn/relax/branches/gui_testing .
.....
r14394 | bugman | 2011-08-16 21:13:44 +0200 (Tue, 16 Aug 2011) | 5 lines
Changed paths:
M /branches/gui_testing/relax.py
Fix for the GUI mode setting which was broken in r14393.
The multi-processor code merger caused this to be an issue, as the mode is now a class variable.
.....