The command used was:
svn merge -r11578:r11577 .
.....
r11578 | bugman | 2010-09-16 10:22:32 +0200 (Thu, 16 Sep 2010) | 12 lines
Changed paths:
M /branches/bieri_gui/relax
The Bieri GUI is now the default and only GUI for relax.
The options -b and --bieri have been removed. The -g and --gui options require no following 'bieri'
argument to launch the GUI. The GUI can now be started by typing:
$ relax -g
or:
$ relax --gui
.....