tarmstrong/nbdiff — pull request #64 by tarmstrong (2013-11-22 03:29:29+00:00)
Title: Algorithm for preparing the merge

This generates a valid `.ipynb` file that the extension renders with the controls.