Menu
I have the following difftool configuration for KDiff3 in file .gitconfig,
[difftool "kdiff3"]
external = '"C:/Program Files/KDiff3/kdiff3.exe" "$LOCAL" "$REMOTE" --output "$MERGED"'
trustExitCode = false
[difftool]
prompt = false
[diff]
And I am using the following command to see the diff file,
git difftool config/application.config.php -t kdiff3
But when kdiff3 opens, I am unable to edit the file. How can I edit a file in kdiff3 in difftool?
662
Much navigation will be done with the scroll bars and the mouse but you can also navigate with the keys. If you click into either window then you can use the cursor buttons left, right, up, down, page up, page down, home, end, ctrl-home, ctrl-end as you would in other programs.
Add the kdiff3 installation directory to the Windows Path. Add TMP to the WSLENV Windows environment variable (WSLENV=TMP/up). The TMP dir will be used by git for temporary files, like previous revisions of files, so the path must be on the windows filesystem for this to work. Set TMPDIR to TMP in .
When the KDiff3 window opens up, go to menu Merge → Merge Current File.
An output window will be opened where you can resolve the conflicts by selecting, lines from either of your files.
110
If you love us? You can donate to us via Paypal or buy me a coffee so we can maintain and grow! Thank you!
Donate Us With
