Git Mergetool - auto accept non conflicted merges
When I use git mergetool it requires me confirm all merged files rather than simply accepting non conflicting merges and only prompting me to resolve conflicts, which is my preferred behavior.
Are there options/.switches to enable this?
--- EDIT ---
Perhaps this is nothing to do with git and is related to my choice of mergetool : KDiff?
I must have broken the config somehow haivng install Git4Windows and GitExtensions and just generally hacking away at it. A clean install of G4W sorting it all out.