sanchayanmaity/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

git/nvim: Drop diffconflicts

Browse source 
See the discussion on
https://github.com/whiteinge/diffconflicts/issues/26

Also
https://www.eseth.org/2020/mergetools.html
This commit is contained in:
Sanchayan Maity 2023-01-17 09:21:53 +05:30
parent 00db4f1cb8
commit 674409573b
Signed by: sanchayanmaity
GPG key ID: 6F6A0609C12038F3
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
git/.gitconfig
View file

@ -41,6 +41,9 @@
[mergetool] [mergetool]
prompt = false prompt = false
keepBackup = false keepBackup = false
hideResolved = false
[mergetool "nvimdiff1"]
hideResolved = true
[pager] [pager]
difftool = true difftool = true
[pull] [pull]

1
nvim/.config/nvim/lua/plugins.lua
View file

@ -25,7 +25,6 @@ local init = function ()
use 'lewis6991/gitsigns.nvim' use 'lewis6991/gitsigns.nvim'
use 'tpope/vim-fugitive' use 'tpope/vim-fugitive'
use 'https://github.com/SanchayanMaity/gitlinker.nvim' use 'https://github.com/SanchayanMaity/gitlinker.nvim'
use 'whiteinge/diffconflicts'
-- Boost vim command line mode -- Boost vim command line mode
use 'vim-utils/vim-husk' use 'vim-utils/vim-husk'
-- Quickfix -- Quickfix