nbdime provides tools for diffing and merging of Jupyter Notebooks.

 * nbdiff: compare notebooks in a terminal-friendly way
 * nbmerge: 3-way merge of notebooks with automatic conflict resolution
 * nbdiff-web: shows you a rich rendered diff of notebooks
 * nbmerge-web: gives you a web-based three-way merge tool for notebooks
 * nbshow: presents a single notebook in a terminal-friendly way

All dependencies must be built with support for Python 3.