Re: [RFC PATCH 2/3] mergetools/kdiff3: allow opting-out of auto-merges
From: Junio C Hamano <hidden>
Date: 2016-06-15 22:57:11
David Aguilar [off-list ref] writes:
Marked "RFC" because I am kinda against adding more configuration variables.
Just like "git merge" has -X<option> escape hatch to allow us to pass backend-specific options, perhaps you can add a mechanism to "git mergetool" to let the user pass --no-auto from the command line?