The command used was:
svn merge -r8471:8472 svn+ssh://bugman@.../svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses
The changes to the prompt package were manually ported to the user_functions package.
.....
r8472 | semor | 2009-01-15 15:04:33 +0100 (Thu, 15 Jan 2009) | 9 lines
Changed paths:
M /branches/relax_disp/prompt/relax_disp.py
M /branches/relax_disp/specific_fns/relax_disp.py
Started to implement a function for reading 'R2eff' values directly.
This is as proposed in a post at:
https://mail.gna.org/public/relax-devel/2009-01/msg00020.html
(Message-id: <7f080ed10901070529s397f7f23p914c820ced4d07f@...>)
The function does not contain code yet.
.....
