The command used was:
svn merge -r8416:8417 svn+ssh://bugman@.../svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses
.....
r8417 | semor | 2009-01-12 14:42:33 +0100 (Mon, 12 Jan 2009) | 5 lines
Changed paths:
M /branches/relax_disp/specific_fns/relax_disp.py
Made a few corrections proposed by Ed in a post at:
https://mail.gna.org/public/relax-devel/2009-01/msg00066.html
(Message-id: <7f080ed10901120532h736892bbmd03483b4decadf39@...>)
.....