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
..
after	nvim: Add pandoc support	2020-12-14 12:41:35 +05:30
colors	nvim: colors: yolokai: Add highlighting for conflict-markers	2020-12-18 13:56:14 +05:30
compiler	nvim: Use a custom stack compiler for Haskell	2020-01-27 09:30:19 +05:30
lua	git/nvim: Switch to using diffconflicts for resolving merge conflicts	2020-12-19 16:29:06 +05:30
init.lua	nvim: init: Enable python3 provider	2020-12-12 17:20:10 +05:30