user/sven/git.git/mergetools, branch v2.26.0-rc2

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

mergetool: honor mergetool.$tool.trustExitCode for built-in tools

2016-11-29T18:54:03Z

Built-in merge tools contain a hard-coded assumption about whether or not a tool's exit code can be trusted to determine the success or failure of a merge. Tools whose exit codes are not trusted contain calls to check_unchanged() in their merge_cmd() functions. A problem with this is that the trustExitCode configuration is not honored for built-in tools. Teach built-in tools to honor the trustExitCode configuration. Extend run_merge_cmd() so that it is responsible for calling check_unchanged() when a tool's exit code cannot be trusted. Remove check_unchanged() calls from scriptlets since they are no longer responsible for calling it. When no configuration is present, exit_code_trustable() is checked to see whether the exit code should be trusted. The default implementation returns false. Tools whose exit codes can be trusted override exit_code_trustable() to true. Reported-by: Dun Peal Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetools: add support for ExamDiff

2016-04-04T16:15:14Z

Signed-off-by: Jacob Nisnevich Acked-by: David Aguilar Signed-off-by: Junio C Hamano

mergetools: create mergetool_find_win32_cmd() helper function for winmerge

2016-04-04T16:15:00Z

Signed-off-by: Jacob Nisnevich Acked-by: David Aguilar Signed-off-by: Junio C Hamano

mergetool: reorder vim/gvim buffers in three-way diffs

2016-02-12T18:14:09Z

When invoking default (g)vimdiff three-way merge, the merged file is loaded as the first buffer but moved to the bottom as the fourth window. This causes a disconnect between vim commands that operate on window positions (e.g. CTRL-W_w) and those that operate on buffer index (e.g. do/dp). This change reorders the buffers to have the same index as windows while keeping the cursor default to the merged result as the bottom window. Signed-off-by: Dickson Wong Tested-by: Michael J Gruber Acked-by: David Aguilar Signed-off-by: Junio C Hamano