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

..

add.c

Use OPT_CALLBACK and OPT_CALLBACK_F

2020-04-28 10:47:10 -07:00

am.c

auto-gc: pass --quiet down from am, commit, merge and rebase

2020-05-07 12:24:35 -07:00

annotate.c

…

apply.c

…

archive.c

…

bisect--helper.c

Merge branch 'cb/bisect-helper-parser-fix'

2020-06-08 18:06:32 -07:00

blame.c

Merge branch 'dl/opt-callback-cleanup'

2020-05-05 14:54:27 -07:00

branch.c

Merge branch 'dl/branch-cleanup'

2020-06-25 12:27:47 -07:00

bundle.c

…

cat-file.c

Use OPT_CALLBACK and OPT_CALLBACK_F

2020-04-28 10:47:10 -07:00

check-attr.c

…

check-ignore.c

check-ignore: fix documentation and implementation to match

2020-02-18 15:28:58 -08:00

check-mailmap.c

…

check-ref-format.c

…

checkout-index.c

Use OPT_CALLBACK and OPT_CALLBACK_F

2020-04-28 10:47:10 -07:00

checkout.c

Merge branch 'bc/filter-process'

2020-06-08 18:06:30 -07:00

clean.c

clean: optimize and document cases where we recurse into subdirectories

2020-06-12 17:27:16 -07:00

clone.c

Merge branch 'js/reflog-anonymize-for-clone-and-fetch'

2020-06-17 21:54:01 -07:00

column.c

…

commit-graph.c

commit-graph: drop COMMIT_GRAPH_WRITE_CHECK_OIDS flag

2020-05-18 12:51:11 -07:00

commit-tree.c

Use OPT_CALLBACK and OPT_CALLBACK_F

2020-04-28 10:47:10 -07:00

commit.c

Merge branch 'jc/auto-gc-quiet'

2020-05-13 12:19:19 -07:00

config.c

mergetool: allow auto-merge for meld to follow the vim-diff behavior

2020-09-16 17:11:20 -07:00

count-objects.c

…

credential.c

…

describe.c

Merge branch 'jc/describe-misnamed-annotated-tag'

2020-03-26 17:11:21 -07:00

diff-files.c

diff-files: treat "i-t-a" files as "not-in-index"

2020-06-22 10:46:45 -07:00

diff-index.c

…

diff-tree.c

diff-tree.c: load notes machinery when required

2020-04-20 18:22:54 -07:00

diff.c

Merge branch 'dl/diff-usage-comment-update'

2020-06-29 14:17:25 -07:00

difftool.c

…

env--helper.c

…

fast-export.c

Merge branch 'mt/use-passed-repo-more-in-funcs'

2020-02-14 12:54:22 -08:00

fetch-pack.c

Merge branch 'jt/cdn-offload'

2020-06-25 12:27:47 -07:00

fetch.c

Merge branch 'xl/upgrade-repo-format'

2020-06-29 14:17:24 -07:00

fmt-merge-msg.c

Lib-ify fmt-merge-msg

2020-03-24 15:04:43 -07:00

for-each-ref.c

Merge branch 'jk/for-each-ref-multi-key-sort-fix'

2020-05-08 14:25:04 -07:00

fsck.c

Merge branch 'ds/multi-pack-verify'

2020-05-24 19:39:39 -07:00

gc.c

commit-graph.h: store an odb in 'struct write_commit_graph_context'

2020-02-04 11:36:37 -08:00

get-tar-commit-id.c

…

grep.c

Merge branch 'dl/opt-callback-cleanup'

2020-05-05 14:54:27 -07:00

hash-object.c

…

help.c

Merge branch 'es/bugreport'

2020-05-01 13:39:59 -07:00

index-pack.c

promisor-remote: accept 0 as oid_nr in function

2020-04-02 12:42:32 -07:00

init-db.c

Merge branch 'bc/sha-256-part-1-of-4'

2020-03-26 17:11:20 -07:00

interpret-trailers.c

Use OPT_CALLBACK and OPT_CALLBACK_F

2020-04-28 10:47:10 -07:00

log.c

Merge branch 'dl/opt-callback-cleanup'

2020-05-05 14:54:27 -07:00

ls-files.c

Merge branch 'dl/opt-callback-cleanup'

2020-05-05 14:54:27 -07:00

ls-remote.c

…

ls-tree.c

…

mailinfo.c

…

mailsplit.c

…

merge-base.c

rebase: --fork-point regression fix

2020-02-11 09:59:39 -08:00

merge-file.c

…

merge-index.c

…

merge-ours.c

…

merge-recursive.c

…

merge-tree.c

…

merge.c

Merge branch 'an/merge-single-strategy-optim'

2020-06-02 13:35:01 -07:00

mktag.c

sha1-file: allow check_object_signature() to handle any repo

2020-01-31 10:45:39 -08:00

mktree.c

…

multi-pack-index.c

…

mv.c

…

name-rev.c

name-rev: sort tip names before applying

2020-02-05 10:36:33 -08:00

notes.c

Use OPT_CALLBACK and OPT_CALLBACK_F

2020-04-28 10:47:10 -07:00

pack-objects.c

upload-pack: send part of packfile response as uri

2020-06-10 18:06:34 -07:00

pack-redundant.c

…

pack-refs.c

…

patch-id.c

…

prune-packed.c

Lib-ify prune-packed

2020-03-24 15:04:44 -07:00

prune.c

Merge branch 'tb/shallow-cleanup'

2020-05-13 12:19:18 -07:00

pull.c

Merge branch 'rs/pull-leakfix'

2020-06-29 14:17:26 -07:00

push.c

Merge branch 'dl/push-recurse-submodules-fix'

2020-05-05 14:54:28 -07:00

range-diff.c

…

read-tree.c

Use OPT_CALLBACK and OPT_CALLBACK_F

2020-04-28 10:47:10 -07:00

rebase.c

Merge branch 'jc/auto-gc-quiet'

2020-05-13 12:19:19 -07:00

receive-pack.c

Merge branch 'tb/shallow-cleanup'

2020-05-13 12:19:18 -07:00

reflog.c

parse_config_key(): return subsection len as size_t

2020-04-10 14:44:29 -07:00

remote-ext.c

…

remote-fd.c

…

remote.c

Use OPT_CALLBACK and OPT_CALLBACK_F

2020-04-28 10:47:10 -07:00

repack.c

Merge branch 'tb/shallow-cleanup'

2020-05-13 12:19:18 -07:00

replace.c

sha1-file: pass git_hash_algo to hash_object_file()

2020-01-31 10:45:39 -08:00

rerere.c

…

reset.c

Use OPT_CALLBACK and OPT_CALLBACK_F

2020-04-28 10:47:10 -07:00

rev-list.c

rev-list --count: comment on the use of count_right++

2020-02-18 13:21:46 -08:00

rev-parse.c

Merge branch 'tb/shallow-cleanup'

2020-05-13 12:19:18 -07:00

revert.c

…

rm.c

rm: support the --pathspec-from-file option

2020-02-19 10:56:49 -08:00

send-pack.c

Use OPT_CALLBACK and OPT_CALLBACK_F

2020-04-28 10:47:10 -07:00

shortlog.c

Use OPT_CALLBACK and OPT_CALLBACK_F

2020-04-28 10:47:10 -07:00

show-branch.c

Use OPT_CALLBACK and OPT_CALLBACK_F

2020-04-28 10:47:10 -07:00

show-index.c

…

show-ref.c

Use OPT_CALLBACK and OPT_CALLBACK_F

2020-04-28 10:47:10 -07:00

sparse-checkout.c

Merge branch 'xl/upgrade-repo-format'

2020-06-29 14:17:24 -07:00

stash.c

Merge branch 'en/fill-directory-exponential'

2020-04-29 16:15:31 -07:00

stripspace.c

…

submodule--helper.c

submodule: port subcommand 'set-branch' from shell to C

2020-06-02 10:51:54 -07:00

symbolic-ref.c

…

tag.c

Merge branch 'jk/for-each-ref-multi-key-sort-fix'

2020-05-08 14:25:04 -07:00

unpack-file.c

…

unpack-objects.c

sha1-file: pass git_hash_algo to hash_object_file()

2020-01-31 10:45:39 -08:00

update-index.c

Use OPT_CALLBACK and OPT_CALLBACK_F

2020-04-28 10:47:10 -07:00

update-ref.c

update-ref: implement interactive transaction handling

2020-04-02 11:09:49 -07:00

update-server-info.c

…

upload-archive.c

…

upload-pack.c

…

var.c

…

verify-commit.c

…

verify-pack.c

…

verify-tag.c

…

worktree.c

Merge branch 'es/worktree-duplicate-paths'

2020-06-22 15:55:03 -07:00

write-tree.c

…