The command used was:
svn merge -r8655:8656 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.
.....
r8656 | semor | 2009-01-26 22:38:05 +0100 (Mon, 26 Jan 2009) | 7 lines
Changed paths:
M /branches/relax_disp/prompt/relax_disp.py
M /branches/relax_disp/specific_fns/relax_disp.py
Continued to implement the user function calc_r2eff().
This follows a discussion at:
https://mail.gna.org/public/relax-devel/2009-01/msg00067.html
(Message-id: <496B479D.3070304@...>)
.....
