The command used was:
svn merge -r13450:13449 .
.....
r13450 | bugman | 2011-07-06 14:53:05 +0200 (Wed, 06 Jul 2011) | 6 lines
Changed paths:
M /branches/gui_testing/gui/spin_viewer/containers.py
M /branches/gui_testing/gui/spin_viewer/tree.py
The info data structure is no longer passed into the container object.
The Container.display() method has been deleted, and the root, molecule, residue and spin container
methods are called directly from the tree.
.....
