Git is a frustratingly useful tool that has many lesser known features that really should be on by default. Today I wrote about one of them: zdiff3. It makes merge conflicts easier to work through and frees you up for more important things.

<https:ductile.systems/zdiff3>

If you'd like to soft-wrap only the current time, this [#Neovim](https://hachyderm.io/tags/Neovim) plugin implements the functionality by using floating windows and virtual text: <https://github.com/benlubas/wrapping-paper.nvim>