Ubuntu's default text editor is nano. I have no idea how to use nano nor do I want to, yet every time svn opens up a text editor for me to fix my conflicts I end up in nano. I finally got around to fixing it with the following command:
- sudo update-alternatives --config editor