git/mergetools, branch v2.9.2

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

mergetools: add winmerge as a builtin tool

2015-05-20T20:13:44Z

Add a winmerge scriptlet with the commands described in [1] so that users can use winmerge without needing to perform any additional configuration. [1] http://thread.gmane.org/gmane.comp.version-control.git/268631 Helped-by: Philip Oakley Helped-by: Johannes Schindelin Helped-by: Sebastian Schuberth Helped-by: SZEDER Gábor Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetools: stop setting $status in merge_cmd()

2014-11-21T19:27:53Z

No callers rely on $status so there's don't need to set it during merge_cmd() for diffmerge, emerge, and kdiff3. Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

Merge branch 'oc/mergetools-beyondcompare'

2014-10-29T17:08:04Z

* oc/mergetools-beyondcompare: mergetool: rename bc3 to bc

mergetool: rename bc3 to bc

2014-10-21T18:25:30Z

Beyond Compare version 4 works the same way as version 3, so rename the existing "bc3" adaptor to just "bc", while keeping "bc3" as a backward compatible wrapper. Noticed-by: Olivier Croquette Helped-by: David Aguilar Signed-off-by: Junio C Hamano

mergetools/meld: make usage of `--output` configurable and more robust

2014-10-16T18:58:11Z

Older versions of meld listed --output in `meld --help`. Newer versions only mention `meld [OPTIONS...]`. Improve the checks to catch these newer versions. Add a `mergetool.meld.hasOutput` configuration to allow overriding the heuristic. Reported-by: Andrey Novoseltsev Helped-by: Junio C Hamano Signed-off-by: David Aguilar Signed-off-by: Junio C Hamano

mergetools: add vimdiff3 mode

2014-04-22T19:49:07Z

It's similar to the default, except that the other windows are hidden. This ensures that removed/added colors are still visible on the main merge window, but the other windows not visible. Specially useful with merge.conflictstyle=diff3. Signed-off-by: Felipe Contreras Acked-by: David Aguilar Signed-off-by: Junio C Hamano

mergetools/diffmerge: support DiffMerge as a git mergetool

2013-10-13T23:00:57Z

DiffMerge is a non-free (but gratis) tool that supports OS X, Windows and Linux. See http://www.sourcegear.com/diffmerge/ DiffMerge includes a script `/usr/bin/diffmerge` that can be used to launch the graphical compare tool. This change adds mergetool support for DiffMerge and adds 'diffmerge' as an option to the mergetool help. Signed-off-by: Stefan Saasen Acked-by: David Aguilar Signed-off-by: Jonathan Nieder