I'm following the following guide:

which uses a bash script as the mergetool that essentially calls vimdiff. 

After adding the script as my mergetool and then running git mergetool to 
resolve a conflict, I was faced with this error:

git config option merge.tool set to unknown tool: diffconflicts
It then provides a list of mergetool candidates. 

Does git restrict the user to which tools they can use as their mergetool? 
If not, how do I get around the issue described above?


You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To view this discussion on the web visit 
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
For more options, visit this group at 

Reply via email to