kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity
44,074 Commits
7 Branches
1,000 Tags
174 MiB
Commit Graph

2 Commits (a6711ed714d5312ebe495b026ce66f6b2ae890e2)

Author SHA1 Message Date
David Aguilar 1e86d5b11d mergetools: stop setting $status in merge_cmd() 
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>
 2014-11-21 11:27:53 -08:00
Stefan Saasen c5f424fd01 mergetools/diffmerge: support DiffMerge as a git mergetool 
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>
 2013-10-13 16:00:57 -07:00