example of vimdiff process to resolve git conflict