The command used was:
svn merge -r10214:10213 .
.....
r10214 | bugman | 2010-01-14 16:10:02 +0100 (Thu, 14 Jan 2010) | 8 lines
Changed paths:
M /branches/bieri_gui/gui_bieri/relax_gui.py
Added the missing import_seq(), settings(), param_file_setting() and reset_setting() methods.
This corresponds to one component of the patch_II file attached to https://gna.org/task/?6847 by
Michael Bieri (https://gna.org/users/michaelbieri).
This prevented relax from launching the GUI.
.....
