I'm trying to get my cygwin git installation working with kdiff3. I followed Noam Lewis' instructions here: http://noamlewis.wordpress.com/2011/03/22/how-to-use-kdiff3-as-a-difftool-mergetool-with...

In keeping with a number of solutions posted on the internet I have installed KDiff3 and modified .gitconfig as below to make use of it. Nonetheless, when I run git diff HEAD^ HEAD within a reposit...

I have a kdiff3 comparison in Windows, and I would like to save the comparison as a text file in unified diff format. I realize this is kind of a strange question. Usually, people already have the...

While using KDiff3 to resolve merge conflicts, how do I save the resolved copy of the A and B versions? I open KDiff3 to resolve merge conflicts. I am able to resolve each conflict by selecting th...

I would like to be able to resolve conflicts using kdiff3, when SVN notifies me about the conflict. How can I set it as a default tool for this?

I'm learning the use of version control (with Tortoise HG) so this question might be very basic, but I can't figure out how to solve it. Suppose Branch A has a text file with the following: A B C...

kdiff3 is a GUI diff tool that allows you to create a diff of two/three files and selectively choose which lines make up the merged file. Is there a command-line equivalent?

Does anyone know of a way to hide matching lines in Kdiff3 (in Windows). I really only care about the differences and would rather quickly scroll through that list of differences without all the ju...

The merge tool that come with smartgit is very confusing. I am not able to configure kdiff3. I dont get to configure the common ancestor. These are the only three files they give me to configure: ...

I'm frustrated with Mercurial and Python since it makes easy things difficult. I have a trivial conflict and since Mercurial does not give any suggestion what to do I don't know even how to resolve...

The "Add Manual Diff Alignment" in KDiff3 doesn't seem to do anything. The online documentation is rather sparse. Does this function actually work?

Is it possible to set Git up so that I can use the three-way compare in KDiff3? I have two branches that are far too different to auto-merge them, I simply have to check each merge point and I thi...

I can't get my head around KDiff3 or Beyond Compare in the merge mode. Is there any tutorial to this feature?

Just now I've got suggestions to my another question and am trying to merge my feature branch to the working copy of the trunk in the working copy directory of the trunk. Due to a couple of conflic...

How to disable auto-merging in GIT? The purpose is to have the same behaviour as for conflict merges resolution in automatic merges during invocation of command chain: $ git fetch $ git merge som...

I use TortoiseHg to commit changes. The (default) diff that is shown in the commit dialog contains a lot of additions/deletions. But in contrast when I click on the diff icon in the commit dialog...

Anyone know how integrate ExamDiff with Mercurial? I have KDiff3 set up but couldn't figure out how to set up ExamDiff. Update: Per accepted answer, this .hgrc config worked: [extensions] hgext...