git/mergetools, branch v2.29.2

Merge branch 'ls/mergetool-meld-auto-merge'

2020-09-22T19:36:29Z

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

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

2020-09-17T00:11:20Z

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 Helped-by: David Aguilar Signed-off-by: Lin Sun Signed-off-by: Junio C Hamano

mergetools: add support for nvimdiff (neovim) family

2020-07-29T21:44:49Z

Signed-off-by: pudinha Signed-off-by: Junio C Hamano

mergetool--lib: improve support for vimdiff-style tool variants

2020-07-29T21:44:46Z

The merge tools vimdiff2, vimdiff3, gvimdiff2, gvimdiff3 and bc3 are all variants of the main tools vimdiff and bc. They are implemented in the main and a one-liner script that just sources it exist for each. Allow variants ending in [0-9] to be correctly wired without the need for such one-liners, so instead of 5 scripts, only 1 (gvimdiff) is needed. Signed-off-by: pudinha Signed-off-by: Junio C Hamano

mergetools: add support for smerge (Sublime Merge)

2019-04-04T09:21:25Z

Teach difftool and mergetool about the Sublime Merge "smerge" command. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetools: add support for guiffy

2018-04-05T23:11:39Z

Add guiffy as difftool and mergetool guiffy is available on Windows, Linux, and MacOS Signed-off-by: Bill Ritcher Reviewed-by: David Aguilar Signed-off-by: Junio C Hamano

mergetools/meld: improve compatibiilty with Meld on macOS X

2017-06-19T05:11:29Z

The macOS X fork of Meld[1] requires a "=" in the "--output" argument, as it uses a wrapper[2] script that munges the "--output" argument before calling into the common "meld" script. The macOS X wrapper script[2] accepts "--output=" only, despite the fact that the underlying meld code accepts both "--output "[3]. All versions of meld which accept "--output" accept it in the "--output=" form, so use "--output=" for maximum compatibility. [1] https://github.com/yousseb/meld [2] https://github.com/yousseb/meld/blob/master/osx/Meld [3] https://github.com/yousseb/meld/issues/42 Reported-by: Matthew Groth Helped-by: Samuel Lijin Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

Merge branch 'da/mergetool-xxdiff-hotkey'

2016-12-19T22:45:41Z

The way to specify hotkeys to "xxdiff" that is used by "git mergetool" has been modernized to match recent versions of xxdiff. * da/mergetool-xxdiff-hotkey: mergetools: fix xxdiff hotkeys

mergetools: fix xxdiff hotkeys

2016-12-12T00:20:32Z

xxdiff was using a mix of "Ctrl-" and "Ctrl+" hotkeys. The dashed "-" form is not accepted by newer xxdiff versions. Use the plus "+" form only. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetools/vimdiff: trust Vim's exit code

2016-11-29T18:57:41Z

Allow vimdiff users to signal that they do not want to use the result of a merge by exiting with ":cquit", which tells Vim to exit with an error code. This is better than the current behavior because it allows users to directly flag that the merge is bad, using a standard Vim feature, rather than relying on a timestamp heuristic that is unforgiving to users that save in-progress merge files. The original behavior can be restored by configuring mergetool.vimdiff.trustExitCode to false. Reported-by: Dun Peal Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano