test for git diff
Merge branch 'master' of ssh://github.com/Marslo/VimConfig