Handle more states in svn-delete-resolve subcommand
Make the svn-tree-conflicts command also list text conflicts, and rename the subcommand to svn-conflicts accordingly.