Solving three-way Git merges in Vimdiff