git/mergetools/diffmerge, branch v2.4.7Mirror of https://git.kernel.org/pub/scm/git/git.git/
https://git.shady.money/git/atom?h=v2.4.72014-11-21T19:27:53Zmergetools: stop setting $status in merge_cmd()2014-11-21T19:27:53ZDavid Aguilardavvid@gmail.com2014-11-21T09:03:10Zurn:sha1:1e86d5b11dcf31adf11363caa1e96a94612b16f4
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 <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
mergetools/diffmerge: support DiffMerge as a git mergetool2013-10-13T23:00:57ZStefan Saasenssaasen@atlassian.com2013-10-12T22:29:35Zurn:sha1:c5f424fd014488bd8a92b97f52bfe47823bc2128
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 <ssaasen@atlassian.com>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>