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
..
.config/git	git: Use a global gitignore	2020-04-16 10:26:58 +05:30
.gitconfig	git/nvim: Switch to using diffconflicts for resolving merge conflicts	2020-12-19 16:29:06 +05:30