How do I use vimdiff to resolve a git merge conflict?
I just merged a branch into my master in git and I got Automatic merge failed; fix conflicts and then commit the result. … Read more
mergetool
Git: How can I configure KDiff3 as a merge tool and diff tool?
Recently I was using GitExtension 2.46, but the Git version that has the same is 1.9.4.msysgit.2. Willing to use only Git commands, I … Read more