kdiff3

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? Jon Ander Ortiz Durántez Go to the Subversion configuration file ( /etc/subversion/config or ~/.subversion/config ), and set merge-tool-cmd variable with your favourite tool: ### Set merge-tool-cmd to the command used to invoke your external ### merging tool of choice. Subversion will pass 4 arguments to ### the specified command: base theirs mine merged # merge-tool-cmd = merge_command Although there is a problem with kdiff3 which does not support

In .gitconfig file I setup up the git diff as follows: [diff] tool = kdiff3 [difftool "kdiff3"] path = path_directory/kdiff3.app In this setting kdiff is not accessible and I get the following error when I run in terminal >> git difftool The diff tool kdiff3 is not available as 'Kdiff_local_software_path/kdiff3.app' fatal: external diff died, stopping at modified_file Do you have any suggestion I can fix this issue ? In my current setup Mac OS 10.10.5 git diff tool is git merge tool that I want to replace with kdiff. hjpotter92 kdiff3 is generally located at the following location:

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 this trivial file conflict: The conflict is trivial but if I can't resolve this I can't resolve anything complicated either. Can I just edit the file to a way I want and commit it again from anywhere? Should I run hg merge ? Why can't Mercurial even let me choose a version to keep? Why is something trivial near impossible to do without digging through 1000 poorly written manpages? Martin Geisler You

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 -- . And then select Merge File in KDiff3. After having gone through the files I'd just commit. I have set up merge.conflictstyle and diff.conflictstyle to diff3 but KDiff3 still starts with a two-way diff. Is this possible? I guess if Git also sends the common ancestor's

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 of performing the same 3-way merge on files without conflict merges. I couldn't find any solution on the internet, is there any? I've some workarounds in mind, but it would prefer to avoid it. Thanks in advance, Aleks For changes that were made only on one side or the

I committed some changes in the branch new . I checkout out to master . When I tried to merge: $ git merge new Auto-merging js/site.js CONFLICT (content): Merge conflict in js/site.js Automatic merge failed; fix conflicts and then commit the result. So I installed kdiff3 and configured my config files and when I tried to use mergetools I got: $ git mergetool kdiff3 No files need merging I ran a diff and it outputted this: diff --cc js/site.js index 8c17d62,7955b13..0000000 --- a/js/site.js +++ b/js/site.js @@@ -72,4 -81,18 +81,22 @@@ function doSmallScreen() $(document).ready(function () {

How could I force the mergetool GUI to be always shown and disable any automatic resolving? Sometimes when there is a conflict during a merge and I use the mergetool, it simply immediately returns after I hit Enter on question "Hit return to start merge resolution tool (kdiff3)" and no GUI is shown and the conflict appears to be resolved. I have Git configured to use KDiff3 as the mergetool now, but it happened also when I have codecompare as the mergetool specified. I know that there is an option "Auto save and quit on merge without conflicts" in KDiff3, which could theoretically cause the