@slicknet git-svn means never having to say "merge pain."