projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 458205f dbd8c09)
Merge branch 'ls/mergetool-meld-auto-merge'
authorJunio C Hamano <gitster@pobox.com>
Tue, 22 Sep 2020 19:36:29 +0000 (12:36 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Sep 2020 19:36:29 +0000 (12:36 -0700)
commit4aff18a3f02fece0d758427294907e7a80aa6bff
treede8be4d77f8537e8b1d745e8bf97891feec42359tree | snapshot
parent458205ff0f43f8f0ffe70aa7f06d314fcce25809commit | diff
parentdbd8c09bfe9d783ae01121bafb26a2dd108c0c3fcommit | 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
builtin/config.c diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.