Tools for diffing and merging of Jupyter notebooks.
A better Vimdiff Git mergetool
:cake: Efficient way of using Vim as a Git mergetool
A Kakoune-based mergetool for Git