The command used was:
svn merge -r8732:8733 svn+ssh://bugman@.../svn/relax/branches/relax_disp/specific_fns/@r18123 specific_analyses
.....
r8733 | semor | 2009-02-04 17:26:10 +0100 (Wed, 04 Feb 2009) | 6 lines
Changed paths:
M /branches/relax_disp/specific_fns/relax_disp.py
Fixed an import (as well as a few comments).
This however introduces an error concerning the 'chi2' being undefined in the C module for
relaxation dispersion...
.....