aboutsummaryrefslogtreecommitdiff
path: root/development/jupyter-nbdime/README
diff options
context:
space:
mode:
Diffstat (limited to 'development/jupyter-nbdime/README')
-rw-r--r--development/jupyter-nbdime/README7
1 files changed, 7 insertions, 0 deletions
diff --git a/development/jupyter-nbdime/README b/development/jupyter-nbdime/README
new file mode 100644
index 0000000000000..e2aeaa08fdce4
--- /dev/null
+++ b/development/jupyter-nbdime/README
@@ -0,0 +1,7 @@
+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