Smartsvn merge across different files