Commits

History for

Commits on Feb 23, 2021

mergetools/vimdiff: add vimdiff1 merge tool variant

whiteinge
authored and
gitster
committed
30bb808

Commits on Jul 29, 2020

mergetools: add support for nvimdiff (neovim) family

pudiva
authored and
gitster
committed
1186897
mergetool--lib: improve support for vimdiff-style tool variants

pudiva
authored and
gitster
committed
83bbf9b

Commits on Nov 29, 2016

mergetools/vimdiff: trust Vim's exit code

davvid
authored and
gitster
committed
2967284
mergetool: honor mergetool.$tool.trustExitCode for built-in tools

davvid
authored and
gitster
committed
7c10605

Commits on Feb 12, 2016

mergetool: reorder vim/gvim buffers in three-way diffs

diwo
authored and
gitster
committed
2300328

Commits on Apr 22, 2014

mergetools: add vimdiff3 mode

felipec
authored and
gitster
committed
7c147b7

Commits on Jan 29, 2013

mergetools: simplify how we handle "vim" and "defaults"

davvid
authored and
gitster
committed
073678b

Loading