Sanchayan Maity d8fc9facec nvim/git: Use vimdiff as merge tool & drop DiffConflicts ... The conflict markers plugin is what we have been using all the time and is useful even without resorting to merge tool. Drop the DiffConflicts plugin and use vimdiff as the merge tool if at all we need to resort to a full 3 way merge view. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>		2020-09-17 10:48:11 +05:30
..
.config/git	git: Use a global gitignore	2020-04-16 10:26:58 +05:30
.gitconfig	nvim/git: Use vimdiff as merge tool & drop DiffConflicts	2020-09-17 10:48:11 +05:30