nbdime provides tools for diffing and merging of Jupyter Notebooks.

 * nbdiff compare notebooks in a terminal-friendly way
 * nbmerge three-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 present a single notebook in a terminal-friendly way
