I use KDiff as a merge tool with Git. After an unsuccessful Git Merge, I started solving conflicts for individual files with git mergetool, which calls KDiff as specified in my config.
However for one file it said "Number of conflicts : x. Number of conflicts automatically solved : x. Remaining conflicts : 0" or something to that effect. Clicking ok return to the console which went to the next file.
Upon reviewing the result I was not happy with it. I now want to know if it is possible to reopen KDiff with the standard 3-way merge view, even if I can't make edits, just to see how it has interpreted and done things in detail.
EDIT : Here's a possible partial solution which has the first part missing :
Set KDiff to not close upon automatically solving all conflicts - or otherwise not solve conflicts automatically at all (first option obviously preferred, but found some stack overflow topics on how to do the second like here). Will investigate if the first option is possible at all, currently not implemented.
Use the command git checkout -m <path/to/file.extension> to revert the file to its post-merge conflicting state (with conflict tags and everything, such that the file will be marked as in "unresolved conflict" state or whatever and then calling git mergetool <path/to/file.extension> will run KDiff on that file again, this time with the new setting)
So in the end the solution suggested here does exactly what is needed : auto-merge but not close even if no conflicts are left, such that you can review everything KDiff did.
Now for any file that you have already finished merged, you can use git checkout -m <path/to/file.extension> to revert it back into its "merged with unresolved conflicts" state, and then run the modified "KDiff no auto" mergetool.