Bruno BELANYI a7bdded5c6 [ADD][GIT] Alias m4 to vimdiff 4-window view ... Sometimes it is useful to also have the base file accessible when merging branches. This view still has the local file on the left and the remote branch on the right, with the base in the middle and the result at the bottom. The d1o/d2o/d3o take from the local/base/remote for the current file.		2019-10-19 05:46:29 +02:00
..
.gitconfig	[ADD][GIT] Alias m4 to vimdiff 4-window view	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