tree de8be4d77f8537e8b1d745e8bf97891feec42359
parent 458205ff0f43f8f0ffe70aa7f06d314fcce25809
parent dbd8c09bfe9d783ae01121bafb26a2dd108c0c3f
author Junio C Hamano <gitster@pobox.com> 1600803389 -0700
committer Junio C Hamano <gitster@pobox.com> 1600803389 -0700

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