SVN alias to resolve conflicts.