diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-09-22 12:36:29 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-09-22 12:36:29 -0700 |
| commit | 4aff18a3f02fece0d758427294907e7a80aa6bff (patch) | |
| tree | de8be4d77f8537e8b1d745e8bf97891feec42359 /builtin/commit.c | |
| parent | 458205ff0f43f8f0ffe70aa7f06d314fcce25809 (diff) | |
| parent | dbd8c09bfe9d783ae01121bafb26a2dd108c0c3f (diff) | |
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
Diffstat (limited to 'builtin/commit.c')
0 files changed, 0 insertions, 0 deletions