]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (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)
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

1  2 
builtin/config.c patch | diff1 | diff2 | blob | history

diff --cc builtin/config.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.