diff/merge

src/lib/diff/mdiff.py

@@ -60,5 +60,31 @@ def compute_diff(path_filea, path_fileb):
 
   return out
 
+def txt_diff(path_filea, path_fileb):
+  ldiff = compute_diff(path_filea, path_fileb)
+
+  tdiff = ''
+
+  astart = '<<<<<<< %s\n' % (path_filea,)
+  sep = '======='
+  bstart = '>>>>>>> %s\n' % (path_fileb,)
+
+  for block in ldiff:
+    islast_block = True if block == ldiff[-1] else False
+
+    if isinstance(block[0], list):
+      ja = ''.join(block[0])
+      tdiff += astart + ja + sep + '\n'
+      jb = ''.join(block[1])
+      tdiff += bstart + jb + sep
+      if not islast_block:
+        tdiff += '\n'
+      continue
+
+    tdiff += ''.join(block)
+
+  print(tdiff)
+  return tdiff
+
 def merge_diff(txt_diff, outfile):
   pass