Vimdiff branch and commit