The command used was:
svn merge -r27241:r27240 .
This was discussed at http://thread.gmane.org/gmane.science.nmr.relax.devel/7502/focus=7512.
.....
r27241 | bugman | 2015-01-20 15:04:18 +0100 (Tue, 20 Jan 2015) | 6 lines
Changed paths:
M /trunk/dep_check.py
Added a RelaxWarning printout to the dep_check module if wxPython 2.8 or less is encountered.
This follows from http://thread.gmane.org/gmane.science.nmr.relax.devel/7502. The warning text is
simply written to STDERR as relax starts.
.....
