projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e156455) | patch
mergetools: add vimdiff3 mode felipec/fc/mergetool/vimdiff3
authorFelipe Contreras <felipe.contreras@gmail.com>
Mon, 21 Apr 2014 00:05:17 +0000 (19:05 -0500)
committerFelipe Contreras <felipe.contreras@gmail.com>
Thu, 29 May 2014 00:03:10 +0000 (19:03 -0500)
commit0257b4ba8c240575532bf5a348585c00bd85ff2f
treecba5be5c2773a98c82f60dec28487eab8631c97atree | snapshot
parente156455ea49124c140a67623f22a393db62d5d98commit | 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>
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.