Bruno BELANYI 4e6821a0f2 [ADD][GIT] Use vim-fugitive as default mergetool ... I really like the way vim-fugitive show a merge conflict by having our local index on the left (the target), and the remote changes on the right (what we're trying to merge with our branch). The result is obviously the file in the middle. The d2o and d3o mappings take from local/remote for the current chunk.		2019-10-19 05:46:29 +02:00
..
.gitconfig	[ADD][GIT] Use vim-fugitive as default mergetool	2019-10-19 05:46:29 +02:00
.gitignore	[ADD] git global configuration	2019-07-11 14:38:59 +02:00
.stow-local-ignore	[ADD] git global configuration	2019-07-11 14:38:59 +02:00