Git difftool - KDiff3 can't edit a file

Question

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?

Answer 1

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.