From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 22 Sep 2020 19:36:29 +0000 (-0700)
Subject: Merge branch 'ls/mergetool-meld-auto-merge'
X-Git-Tag: v2.29.0-rc0~56
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4aff18a3f02fece0d758427294907e7a80aa6bff;p=thirdparty%2Fgit.git

Merge branch 'ls/mergetool-meld-auto-merge'

The 'meld' backend of the "git mergetool" learned to give the
underlying 'meld' the '--auto-merge' option, which would help
reduce the amount of text that requires manual merging.

* ls/mergetool-meld-auto-merge:
  mergetool: allow auto-merge for meld to follow the vim-diff behavior
---

4aff18a3f02fece0d758427294907e7a80aa6bff