Merge git, git-svn in case..esac