Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Enable auto-merge for meld to follow the vimdiff beharior #781

Closed
wants to merge 1 commit into from
Closed

Enable auto-merge for meld to follow the vimdiff beharior #781

wants to merge 1 commit into from

Commits on Sep 8, 2020

  1. Support 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>
    Lin Sun committed Sep 8, 2020
    Copy the full SHA
    1b931e6 View commit details
    Browse the repository at this point in the history