tarmstrong/nbdiff — pull request #61 by MandMk (2013-11-21 23:54:48+00:00)
Title: Mergecommand

Changed the merge function in the commands.py and made other modifications to the other notebook_parse to take a json_data instead of a path. Also added a merge.py file but that doesn't do anything for now.