Ok so I found a workaround: I commented out all lines starting with <<<<< and ===== inside ui.rb and everything works fine. Is this some sort of svn malfunctioning? how did those lines get into (my copy of) ui.rb? sorry if this is obvious to svn wizards (but in that case, please drop me a word) Piero