[PATCH] mergetools: add config option to disable auto-merge

During conflict resolution, invoking a mergetool which supports auto-merge will pass that option by default to the underlying tool.

This patch is intended to allow one to set 'merge.automerge' to 'false' in order to override this behavior.

Michael Rappazzo (1):
  mergetools: add config option to disable auto-merge

 Documentation/config.txt        |  6 ++++++
 Documentation/git-mergetool.txt | 19 +++++++++++++------
 mergetools/araxis               |  4 +++-
 mergetools/diffmerge            |  4 +++-
 mergetools/kdiff3               |  4 +++-
 5 files changed, 28 insertions(+), 9 deletions(-)