Sanchayan Maity 7738d0c621 git: Use vim-mergetool for merge conflicts ... Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>		2020-02-16 17:54:11 +05:30
..
.gitconfig	git: Use vim-mergetool for merge conflicts	2020-02-16 17:54:11 +05:30