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.extdiff = [extdiff] cmd.examdiff = C:\Program Files\ExamDiff Pro\ExamDiff.exe Can run ExamDiff with the comand hg examdiff ...
Hi, I use TortoiseHg to commit changes. The diff that is shown in the commit dialog contains a lot of additions/deletions. I configured KDiff3 as external diff tool. When I click on the diff icon in the commit dialog, KDiff3 opens and that comparison is a lot more 'intelligent': it detects 'better' what I changed: I moved a block of co...
Hi, 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 some_branch $ git mergetool The last command leads us to 3-way merge of files in case of merge conflicts. I would like to have an easy way...
Hi all, i have more than one directory and want to check if there is any common files between directories should be identify and merge all the changes into only one file in ouput directory.i tried with kdiff3 and winmerge but not succeed. like this is directories strcuture 1)dir\doc.txt 2)dir2\doc.txt output directory will be...
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 think the best way would be to check out the branch I want the changes from the other branch and say git difftool HEAD_OF_OTHER_BRANCH -- . An...
On Mac, I installed kdiff3 to use with Mercurial to do hg vdiff but every time, it shows Qt: qcolorFromCGColor: cannot convert from colorspace model: 0 Qt: qcolorFromCGColor: cannot convert from colorspace model: 0 Qt: qcolorFromCGColor: cannot convert from colorspace model: 0 Qt: qcolorFromCGColor: cannot convert from colorspace mo...
I can't get my head around KDiff3 or Beyond Compare in the merge mode. Is there any tutorial to this feature? ...
Why am I given three choices when merging between my code and someone else's? Shouldn't there just be my code, the other person's code, and the output below? The documentation for KDIFF doesn't help me understand. ...