Sanchayan Maity f8ce9ccb21 git: gitconfig: Remove diff3 as conflict style ... diff3 as conflict style was required by vim-mergetool. It is not required by the current plugins we are using. Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>		2020-05-05 11:26:23 +05:30
..
.config/git	git: Use a global gitignore	2020-04-16 10:26:58 +05:30
.gitconfig	git: gitconfig: Remove diff3 as conflict style	2020-05-05 11:26:23 +05:30