Sanchayan Maity 96aa7aec83 git: Use nvimdiff1 as the merge tool ... The feature provided by the vim-diffconflicts plugin seems to have been merged upstream. Use of nvimdiff1 should now suffice. See https://www.eseth.org/2020/mergetools.html There also seems to be a new proposal adding layout support which will be interesting once merged. https://lore.kernel.org/all/20220327112307.151044-1-greenfoo@u92.eu/		2022-05-04 10:59:39 +05:30
..
.config/git	git: ignore: Ignore any private notes we use	2022-05-04 10:59:39 +05:30
.gitconfig	git: Use nvimdiff1 as the merge tool	2022-05-04 10:59:39 +05:30