git - git

	Commit message (Expand)	Author	Age	Files	Lines
*	mergetools: vimdiff: simplify tabfirst	Felipe Contreras	2022-08-10	1	-25/+19
*	mergetools: vimdiff: fix single window layouts	Felipe Contreras	2022-08-10	1	-12/+8
*	mergetools: vimdiff: rework tab logic	Felipe Contreras	2022-08-10	1	-28/+22
*	mergetools: vimdiff: fix for diffopt	Felipe Contreras	2022-08-10	1	-18/+18
*	mergetools: vimdiff: silence annoying messages	Felipe Contreras	2022-08-10	1	-2/+2
*	mergetools: vimdiff: make vimdiff3 actually work	Felipe Contreras	2022-08-10	1	-18/+18
*	mergetools: vimdiff: fix comment	Felipe Contreras	2022-08-10	1	-2/+2
*	Merge branch 'fr/vimdiff-layout-fix' into maint	Junio C Hamano	2022-07-27	1	-18/+18
\|\
\| *	vimdiff: make layout engine more robust against user vim settings	Fernando Ramos	2022-07-08	1	-18/+18
* \|	Merge branch 'js/vimdiff-quotepath-fix' into maint	Junio C Hamano	2022-07-27	1	-4/+35
\|\ \ \| \|/ \|/\|
\| *	mergetool(vimdiff): allow paths to contain spaces again	Johannes Schindelin	2022-07-14	1	-4/+35
\|/
*	vimdiff: add tool documentation	Fernando Ramos	2022-04-04	1	-0/+53
*	vimdiff: new implementation with layout support	Fernando Ramos	2022-03-30	1	-29/+529
*	mergetools/vimdiff: add vimdiff1 merge tool variant	Seth House	2021-02-23	1	-1/+12
*	mergetools: add support for nvimdiff (neovim) family	pudinha	2020-07-29	1	-6/+9
*	mergetool--lib: improve support for vimdiff-style tool variants	pudinha	2020-07-29	1	-0/+8
*	mergetools/vimdiff: trust Vim's exit code	David Aguilar	2016-11-29	1	-0/+4
*	mergetool: honor mergetool.$tool.trustExitCode for built-in tools	David Aguilar	2016-11-29	1	-2/+0
*	mergetool: reorder vim/gvim buffers in three-way diffs	Dickson Wong	2016-02-12	1	-2/+2
*	mergetools: add vimdiff3 mode	Felipe Contreras	2014-04-22	1	-2/+12
*	mergetools: simplify how we handle "vim" and "defaults"	David Aguilar	2013-01-29	1	-0/+36