1 Set up vimdiff The vimdiff as a merge tool will display several buffers to show the yours/theirs/original changes. The key point is to set up the vimdiff so that the buffer number in the vimdiff status line is visible. First, add following code int