The command used was:
svn merge -r8334:8335 svn+ssh://bugman@.../svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses
.....
r8335 | semor | 2009-01-08 16:19:09 +0100 (Thu, 08 Jan 2009) | 9 lines
Changed paths:
M /branches/relax_disp/specific_fns/relax_disp.py
Changed the index name and description.
This is as proposed by Ed in a post at:
https://mail.gna.org/public/relax-devel/2009-01/msg00029.html
(Message-id: <7f080ed10901080144u541e6ed5ve52d2d233f8d7cf7@...>)
The description might change later to be more appropriate when the code is more mature...
.....
