]> git.ipfire.org Git - thirdparty/git.git/commit - mergetools/vimdiff
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 0bc85ab) | patch
mergetools: add vimdiff3 mode
authorFelipe Contreras <felipe.contreras@gmail.com>
Mon, 21 Apr 2014 00:24:20 +0000 (19:24 -0500)
committerJunio C Hamano <gitster@pobox.com>
Tue, 22 Apr 2014 19:49:07 +0000 (12:49 -0700)
commit7c147b77d34f072c40b912fafba499727921fa6e
treed74950fe1df88876d77fbe9e4122bd1bddd9878atree | snapshot
parent0bc85abb7aa9b24b093253018801a0fb43d01122commit | diff
mergetools: add vimdiff3 mode

It's similar to the default, except that the other windows are hidden.
This ensures that removed/added colors are still visible on the main
merge window, but the other windows not visible.

Specially useful with merge.conflictstyle=diff3.

Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
Acked-by: David Aguilar <davvid@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
mergetools/gvimdiff3 [new file with mode: 0644] blob
mergetools/vimdiff diff | blob | blame | history
mergetools/vimdiff3 [new file with mode: 0644] blob
Unnamed repository; edit this file 'description' to name the repository.