Collectives™ on Stack Overflow

Find centralized, trusted content and collaborate around the technologies you use most.

Teams

Q&A for work

Connect and share knowledge within a single location that is structured and easy to search.

I'm trying to perform my first Git merge ever (exciting!), but can't get Git Gui (0.13.GITGUI from Git 1.7.4.msysgit.0) to recognize TortoiseMerge (1.6.11.20210 x64) on Windows 7. Based on an answer to a similar question , I've made the following configuration changes:

$ git config --global merge.tool tortoisemerge
$ git config --global mergetool.tortoisemerge.cmd 'TortoiseMerge.exe -base:"$BASE" -mine:"$LOCAL" -theirs:"$REMOTE" -merged:"$MERGED"'
$ git config --global --list
...snip...
merge.tool=tortoisemerge
mergetool.tortoisemerge.cmd=TortoiseMerge.exe -base:"$BASE" -mine:"$LOCAL" -theirs:"$REMOTE" -merged:"$MERGED"
Unfortunately, when I start Git Gui and attempt to "Run Merge Tool", I receive the error Unsupported merge tool 'tortoisemerge'.
Can anyone tell me what I've done wrong?  Here's the relevant sections of my ~/.gitconfig:
[merge]
        tool = tortoisemerge
[mergetool "tortoisemerge"]
        cmd = TortoiseMerge.exe -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\"
Update
TortoiseMerge works fine with the above config when running git mergetool from the command line.  It seems that only Git Gui has problems with it.  :-/
                @Ben — It is indeed in my path, and specifying the full path doesn't seem to have any effect.  :-/
– Ben Blank
                Mar 4, 2011 at 6:38
                @Ben: ok, I was just checking if it has anything to do with code.google.com/p/msysgit/issues/detail?id=479#makechanges and the TortoiseMerge request at tortoisesvn.tigris.org/ds/…
– VonC
                Mar 4, 2011 at 7:31
If you have the latest git, run this command line once:
git config merge.tool tortoisemerge
Important: Do not add a .exe extension to the command.
If that fails, or if you want to add a different merge tool that git doesn't know about, do this:
Open one of the following in an editor:
64-bit git: C:\Program Files\Git\mingw64\share\git-gui\lib\mergetool.tcl
32-bit git: C:\Program Files (x86)\Git\share\git-gui\lib\mergetool.tcl
Add something like this to mergetool.tcl:
tortoisemerge {
    set cmdline [list TortoiseMerge.exe -base:"$BASE" -mine:"$LOCAL" -theirs:"$REMOTE" -merged:"$MERGED"]
Put the new tortoisemerge entry above this other code:
default {
        error_popup [mc "Unsupported merge tool '%s'" $tool]
        return
Bonus example:
To use SourceGear diffmerge, add this to mergetool.tcl:
diffmerge {
    set cmdline [list "C:/Program Files (x86)/SourceGear/DiffMerge/DiffMerge.exe" --merge --result=$MERGED $LOCAL $BASE $REMOTE]
                I have the latested git-for-windows 2.12.2 install on a 64 bit windows, but the tortoisegitmerge.exe is not in the PATH, so both the updated answer and the outdated answer does not work. Both reported: Unsupported merge tool 'tortoisemerge'. While, my tortoisegit is install in the E:\Program Files\TortoiseGit\bin\TortoiseGitMerge.exe. So, any ideas? Thanks.
– ollydbg23
                Apr 10, 2017 at 1:41
[mergetool "tortoise"]
cmd = "TortoiseMerge.exe" -base:"$BASE" -theirs:"$REMOTE" -mine:"$LOCAL" -merged:"$MERGED"
Source: http://programmersunlimited.wordpress.com/2010/07/01/getting-git-to-use-tortoisemerge/
                Same problem, I'm afraid.  (Though now the error is Unsupported merge tool 'tortoise', of course.)
– Ben Blank
                Mar 4, 2011 at 6:07
                Had to put the full path and escape double quotes: cmd = \""c:/Program Files/TortoiseSVN/bin/TortoiseMerge.exe"\" -base:"$BASE" -theirs:"$REMOTE" -mine:"$LOCAL" -merged:"$MERGED"
– Ludovic Kuty
                Mar 13, 2012 at 16:07
                I had a problem with the files, which have spaces in their names. And this syntax can workaround problem: cmd = \""c:/Program Files/TortoiseGIT/bin/TortoiseGitMerge.exe"\" -mine \"$REMOTE\" -base \"$LOCAL\". This works for TortoiseGitMerge, not TortoiseMerge
– Kai
                Jan 19, 2015 at 12:40
For the case that I was working on, the mergetool was already set to tortoisemerge, but it could not find it.
Providing a fully qualified location worked in Windows:
git config --global mergetool.tortoisemerge.cmd "\"C:\\Program Files\\TortoiseGit\\bin\\TortoiseGitMerge.exe\" -base:\"$BASE\" -mine:\"$LOCAL\" -theirs:\"$REMOTE\" -merged:\"$MERGED\""
Try typing TortoiseMerge.exe from the command line to make sure it's in the path. If not add it via My Computer > Properties > Advanced > Environment Variables > System Variables:Path.
Then from command prompt configure it via the following commands
git config --replace --global diff.tool tortoisemerge
git config --replace --global difftool.diffmerge.cmd "TortoiseMerge.exe -base:\"$BASE\" -theirs:\"$REMOTE\" -mine:\"$LOCAL\" -merged:\"$MERGED\""
git config --replace --global difftool.prompt false
To use it from the command prompt, type git difftool from your within your git working directory.
It shows the files one at a time so you're still better off installing TortoiseGit which makes things easier to handle, even if just for the diff part.
This issue appears resolved in the latest git (I have git version 1.9.4.msysgit.1).
C:\git\build>git mergetool
This message is displayed because 'merge.tool' is not configured.
See 'git mergetool --tool-help' or 'git help config' for more details.
'git mergetool' will now attempt to use one of the following tools:
tortoisemerge emerge vimdiff
C:\git\build>git config merge.tool tortoisemerge
C:\git\build>git mergetool
No files need merging
        
Thanks for contributing an answer to Stack Overflow!
Please be sure to answer the question. Provide details and share your research!
But avoid …
Asking for help, clarification, or responding to other answers.
Making statements based on opinion; back them up with references or personal experience.
To learn more, see our tips on writing great answers.