Git has –auto hard coded as a command-line option to KDiff3, which causes the GUI not to show up if all conflicts are auto-resolvable by KDiff3. In the KDiff3 settings you can specify command line options to ignore, but putting –auto there did not work for me. As a workaround I configured my own variant … Read more
Ok, I figured it out. To add manual diff alignment in KDiff3: Put the cursor at the beginning of some text in one child window Hit Ctrl+Y Put the cursor at the beginning of some text in another child window Hit Ctrl+Y
Recent Git versions have built-in support for kdiff3, so there’s no need to configure it manually using the generic cmd and args settings. Instead do: $ git config –global merge.tool kdiff3 And if kdiff3 is not in your PATH environment also do: $ git config –global mergetool.kdiff3.path /Applications/kdiff3.app/Contents/MacOS/kdiff3 This makes git mergetool launch kdiff3. Note … Read more
A refers to the version your merge target is based on. If you Merge from branch to trunk, ‘A’ will be the previous trunk version. B is what you currently have in your local trunk folder, including local changes. C is the Version you wanna merge on top of B.
Here’s a screenshot to walk you through the process that Matt Wilkie described in his answer. Click in the C pane. Choose an encoding other than ‘conflict’ Save
These sites were very helpful, almost, mergetool and difftool. I used the global configuration, but can be used by repository without problems. You just need to execute the following commands: git config –global merge.tool kdiff3 git config –global mergetool.kdiff3.path “C:/Program Files/KDiff3/bin/kdiff3.exe” git config –global mergetool.kdiff3.trustExitCode false git config –global diff.guitool kdiff3 git config –global difftool.kdiff3.path … Read more