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
..
git-completion.bash	mergetools/diffmerge: support DiffMerge as a git mergetool	2013-10-13 16:00:57 -07:00
git-completion.tcsh	Merge branch 'mk/tcsh-complete-only-known-paths'	2013-02-08 15:28:51 -08:00
git-completion.zsh	completion: zsh: improve bash script loading	2013-05-29 12:56:30 -07:00
git-prompt.sh	contrib/git-prompt.sh: handle missing 'printf -v' more gracefully	2013-08-22 09:50:16 -07:00