Git set merge tool vimdiff
Apr 11, · We have to change the git config to set a default mergetool. In this example, we will use vimdiff: $ git config comienzoweb.com vimdiff. We can also set the editor to display the common ancestor BASE while we examine what changes are in LOCAL and REMOTE with the following setting. When git-mergetool is invoked with the -g or --gui option the default merge tool will be read from the configured comienzoweb.coml variable instead of comienzoweb.com --no-gui This overrides a previous -g or --gui setting and reads the default merge tool will be read from the configured comienzoweb.com variable. I just merged a branch into my master in git and I got Automatic merge failed; fix conflicts and then commit the result. Now I ran git mergetool and vimdiff opened with the image below. I don't know how to use vimdiff. What does each panel here mean and how should I proceed to fix the merge conflict?