Sanchayan Maity 7767b23f69 nvim: plugins: Drop conflict-marker ... We have been mostly relying on diffconflicts plugin to resolve merge conflicts. For complex merge conflicts, it becomes difficult to understand which conflict hunk to pick. The syntax highlighting also stopped taking effect due to treesitter probably. So just drop this. Introducing a mapping to jump among conflicts would be helpful. We let the syntax highlighting entries in our color scheme be, just in case we decide to revisit this.		2021-05-14 13:13:43 +05:30
..
.config/nvim	nvim: plugins: Drop conflict-marker	2021-05-14 13:13:43 +05:30
.local/share/nvim/site/pack/packer/opt	nvim: Update packer	2021-05-14 10:25:01 +05:30