added shortcuts for git style 3-way vimdiff