Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
After a merge failed with some conflicts, I can list those with git diff, but git difftool won’t display them with the difftool set in the config (in my case Kaleidoscope). Instead it will just use normal diff.
A git difftool comparing with a previous commit will work.
Is there a way to use git difftool on merge conflicts?
Try
git mergetool.