You do NOT use git mergetool to perform an actual merge. # Choose one of these 2 lines (not both!) explained below.Ĭmd = meld '$LOCAL' '$MERGED' '$REMOTE' -output '$MERGED'Ĭmd = meld '$LOCAL' '$BASE' '$REMOTE' -output '$MERGED' Like difftool you can set the GUI program on the command line using -t / -tool= but, as before, it makes more sense to configure it in your. Meld) to resolve the merge conflicts that have occurred during a merge. Git mergetool allows you to use a GUI merge program (i.e. How do I set up and use Meld as my git mergetool? If you want them the other way around simply swap them around like this: cmd = meld '$REMOTE' '$LOCAL'įinally the prompt = false line simply stops git from prompting you as to whether you want to launch Meld or not, by default git will issue a prompt. The order of the Meld GUI window panes can be controlled by the order of $LOCAL and $REMOTE in cmd, that is to say which file is shown in the left pane and which in the right pane. If properly configured a Meld window will open displaying the diff using a GUI interface. You use git difftool in exactly the same way as you use git diff. Meld) instead of displaying the diff output in your terminal.Īlthough you can set the GUI program on the command line using -t / -tool= it makes more sense to configure it in your. Git difftool displays the diff using a GUI diff program (i.e. How do I set up and use Meld as my git difftool?

Note: It is not necessary to use the same program as both your difftool and mergetool, different programs can be set for both.

How do I set up and use Meld as my git mergetool?.

How do I set up and use Meld as my git difftool?.

The following 2 questions will be answered in my answer below: Meld is a popular free, open-source, and cross-platform (UNIX/Linux, OSX, Windows) choice as shown in the StackOverflow question, What's the best visual merge tool for Git?, in which the answer proposing Meld has more than 3 times the votes as any other tool. There are a lot of different programs that can be used as your git difftool and mergetool, and there is certainly no consensus as to which is the best (opinions, requirements, and OSes will clearly differ). It took me a while to piece together everything I wanted to know. Although much of the information in this question and answer is available on StackOverflow, it is spread out over lots of pages and among other answers which are either wrong or misleading.

Sublime merge mergetool