Bugfix in comparison of stream output.

nbdime/diffing/notebooks.py

@@ -116,7 +116,12 @@ def compare_output_data(x, y):
         return False
 
     if ot == "stream":
-        pass
+        if x["name"] != y["name"]:
+            return False
+        if x["text"] != y["text"]:
+            return False
+        #d = diff(x["text"], y["text"])
+        #return bool(d)  # FIXME
     else:  # if ot == "display_data" or ot == "execute_result":
         if set(x["data"].keys()) != set(y["data"].keys()):
             return False
@@ -132,6 +137,7 @@ def compare_output_data(x, y):
 
 def diff_source(a, b, compare="ignored"):
     "Diff a pair of sources."
+    # FIXME: Make sure we use linebased diff of sources
     # TODO: Use google-diff-patch-match library to diff the sources?
     return diff(a, b)
 

nbdime/merging/generic.py

@@ -89,7 +89,7 @@ def _merge_dicts(base, local, remote, base_local_diff, base_remote_diff):
             # (5) Conflict: removed one place and edited another, or edited in different ways
             local_conflict_diff[key] = ld
             remote_conflict_diff[key] = rd
-        elif lop == DELETE and rop == DELETE:
+        elif lop == DELETE:
             # (4) Removed in both local and remote, just don't add it to merge result
             pass
         elif lop in (INSERT, REPLACE, PATCH) and lv == rv: