Fixed conflicts between committia and vim-git.