git/mergetools at 4901884a23c6eaabb0738bddc440f4155f81b973 - git

Tree: 4901884a23

Seth House 30bb8088af mergetools/vimdiff: add vimdiff1 merge tool variant This adds yet another vimdiff/gvimdiff variant and presents conflicts as a two-way diff between 'LOCAL' and 'REMOTE'. 'MERGED' is not opened which deviates from the norm so usage text is echoed as a Vim message on startup that instructs the user with how to proceed and how to abort. Vimdiff is well-suited to two-way diffs so this is an option for a more simple, more streamlined conflict resolution. For example: it is difficult to communicate differences across more than two files using only syntax highlighting; default vimdiff commands to get and put changes between buffers do not need the user to manually specify a source or destination buffer when only using two buffers. Like other merge tools that directly compare 'LOCAL' with 'REMOTE', this tool will benefit when paired with the new `mergetool.hideResolved` setting. Signed-off-by: Seth House <seth@eseth.com> Tested-by: David Aguilar <davvid@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>		4 years ago
..
araxis	…
bc	mergetools/bc: add `bc4` to the alias list for Beyond Compare	4 years ago
codecompare	…
deltawalker	…
diffmerge	…
diffuse	…
ecmerge	…
emerge	…
examdiff	…
guiffy	…
gvimdiff	…
kdiff3	…
kompare	…
meld	mergetool: allow auto-merge for meld to follow the vim-diff behavior	5 years ago
nvimdiff	mergetools: add support for nvimdiff (neovim) family	5 years ago
opendiff	…
p4merge	…
smerge	…
tkdiff	…
tortoisemerge	…
vimdiff	mergetools/vimdiff: add vimdiff1 merge tool variant	4 years ago
winmerge	…
xxdiff	…