The command used was:
svn merge -r5603:5604 svn+ssh://bugman@.../svn/relax/1.2/specific_fns/model_free.py specific_fns/model_free/mf_minimise.py
.....
r5604 | bugman | 2008-04-12 22:20:59 +0200 (Sat, 12 Apr 2008) | 7 lines
Changed paths:
M /1.2/specific_fns/model_free.py
Fix for bug #11476 (https://gna.org/bugs/index.php?11476).
This bug is fatal for Monte Carlo simulations if model m0 is encountered. The problem was that
there was a 'return' statement instead of 'continue' which caused the Monte Carlo simulation
optimisation as soon as model m0 is encountered.
.....