On Tue, 28 Aug 2012 14:53:43 -0700 (PDT)
stantona <adamstanton1...@gmail.com> wrote:

> I'm following the following guide:
> http://vim.wikia.com/wiki/A_better_Vimdiff_Git_mergetool#Comments
> 
> 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?

Did you properly set the tool's command line as described in [1]?
Is your script executable?

1. 
http://git-scm.com/book/en/Customizing-Git-Git-Configuration#External-Merge-and-Diff-Tools

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To post to this group, send email to git-users@googlegroups.com.
To unsubscribe from this group, send email to 
git-users+unsubscr...@googlegroups.com.
For more options, visit this group at 
http://groups.google.com/group/git-users?hl=en.

Reply via email to