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 /submodule-config.c | |
| parent | Merge branch 'pw/add-p-edit-ita-path' (diff) | |
| parent | mergetool: allow auto-merge for meld to follow the vim-diff behavior (diff) | |
| download | tgif-4aff18a3f02fece0d758427294907e7a80aa6bff.tar.xz | |
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 'submodule-config.c')
0 files changed, 0 insertions, 0 deletions