The command used was:
svn merge -r3692:HEAD svn+ssh://bugman@.../svn/relax/branches/N_state_model/ .
Although the branch was not complete, the future changes to the N-state model code will not affect
the rest of relax. However, the merger was done because this branch was requiring significant
changes to the structural/PDB code (further abstractions and other API improvements). This caused
a lot of individual changes to the generic_fns.stucture module being ported to the branch using
svnmerge, just for debugging. The merger is best for both the branch and the stability of the 1.3
line.