A diffing and merging tool for the IPython Notebook.