Sanchayan Maity dfe44fb14c git/nvim: Switch to using diffconflicts for resolving merge conflicts ... While we dropped diffconflicts earlier and switch to vanilla vimdiff, two way merges are definitely better than three way merges. 3 way merge as in gina or vimdiff is extremely confusing except for may be the simplest of merge conflicts. conflict-marker and diffconflicts should let us handle all cases.		2020-12-19 16:29:06 +05:30
..
modules	nvim: modules: floaterm: Add key mapping to open lazygit directly	2020-12-18 13:55:42 +05:30
autocmd.lua	nvim: Use galaxyline for statusline	2020-10-30 14:28:14 +05:30
keymappings.lua	nvim: Clean up commands for searching word under cursor	2020-11-05 18:58:37 +05:30
lsp.lua	nvim: plugins/lua: Add lspfuzzy	2020-12-14 17:16:28 +05:30
plugins.lua	git/nvim: Switch to using diffconflicts for resolving merge conflicts	2020-12-19 16:29:06 +05:30
treesitter.lua	nvim: Add nvim-treesitter	2020-09-11 20:21:35 +05:30
yolokai.lua	nvim: yolokai: Sync with nvim-highlite upstream	2020-12-19 09:53:09 +05:30