diff, patch and versioning with git and svn