I have to take more care with fugitive and vimdiff with a 3-way merge.