Custom Merge Tools Using GIT

2016 Sep09
G
IT has been my [SCM](https://en.wikipedia.org/wiki/Version_control) tool of choice for white a number of years. Along with it, [VIM](http://www.vim.org/) has always been my intermediate editor for doing commit messages, viewing diffs and resolving merge conflicts. Recently, I have made the switch to [Neovim](https://neovim.io/) as modern replacement for VIM. The nice thing with vim is that it came with a number of handy aliases, such as `vimdiff`. Which was unfortunate, because I really liked VIM's diff support for GIT. I wanted to replicate that, but that would require some manual work on my part to get the two to play nice. Luckily, it isn't really that hard Read More
filed under:  git SCM merge