mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-08 22:36:10 +02:00
Code
59,743 Commits 6 Branches 933 Tags 264 MiB
Commit Graph

2 Commits

Author SHA1 Message Date
Lin Sun dbd8c09bfe mergetool: allow auto-merge for meld to follow the vim-diff behavior 
Make the mergetool used with "meld" backend behave similarly to "vimdiff" by
telling it to auto-merge non-conflicting parts and highlight the conflicting
parts when `mergetool.meld.useAutoMerge` is configured with `true`, or `auto`
for detecting the `--auto-merge` option automatically.

Helped-by: Đoàn Trần Công Danh <congdanhqx@gmail.com>
Helped-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Lin Sun <lin.sun@zoom.us>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2020-09-16 17:11:20 -07:00
Nguyễn Thái Ngọc Duy ea24a76a5e config.txt: move mergetool.* to a separate file 
Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
 2018-10-29 10:17:03 +09:00