update git&svn merge command