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?

Answers


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.


Need Your Help

string to boost::uuid conversion

string boost boost-uuid

I've just started using boost in c++ and I just wanted to ask a couple of questions relating to uuids.

UILocalNotification end date

ios objective-c notifications uilocalnotification nscalendar

I wonder if it's possible to set end date for UILocalNotification?

About UNIX Resources Network

Original, collect and organize Developers related documents, information and materials, contains jQuery, Html, CSS, MySQL, .NET, ASP.NET, SQL, objective-c, iPhone, Ruby on Rails, C, SQL Server, Ruby, Arrays, Regex, ASP.NET MVC, WPF, XML, Ajax, DataBase, and so on.