The command used was:
svn merge -r3525:3526 svn+ssh://bugman@.../svn/relax/1.2/specific_fns/model_free.py specific_fns/model_free/model_free.py
.....
r3526 | bugman | 2007-11-13 22:22:07 +0100 (Tue, 13 Nov 2007) | 8 lines
Changed paths:
M /1.2/specific_fns/model_free.py
Fix for bug #10323 (https://gna.org/bugs/?10323).
This bug was reported by Douglas Kojetin <douglas dot kojetin at gmail dot com>.
This change adds another test for the 'num_ri' structure to the model-free code, just in case. The
additional test is in the writing of simulation model-free results file.
.....