Sanchayan Maity 3e3b3cd153 Revert "git: Use vimdiff3 for merge" ... This reverts commit 513c5f4dda.		2020-10-06 17:28:16 +05:30
..
.config/git	git: Use a global gitignore	2020-04-16 10:26:58 +05:30
.gitconfig	Revert "git: Use vimdiff3 for merge"	2020-10-06 17:28:16 +05:30