The command used was:
svn merge -r8353:8354 svn+ssh://bugman@.../svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses
.....
r8354 | semor | 2009-01-09 23:13:27 +0100 (Fri, 09 Jan 2009) | 7 lines
Changed paths:
M /branches/relax_disp/specific_fns/relax_disp.py
Corrected a few formatting issues and still added parameters for the slow- and fast-exchange regime.
Formatting issues corrected were spotted by Ed in a post at:
https://mail.gna.org/public/relax-devel/2009-01/msg00045.html
(Message-id: <7f080ed10901091243k76e08449ld2d1a4d273b97f71@...>)
.....
