michel-orgmode / michel / michel.py

Diff from to

michel/michel.py

 import sys
 import re
 import cStringIO
-
+import diff3
 
 class TasksTree(object):
     """
     
     return joined_tree
 
+def treemerge(new_tree, old_tree, other_tree):
+    old = str(old_tree)
+    other = str(other_tree)
+    new = str(new_tree)
+    merged_text, was_conflict = diff3.merge3_text(new, old, other)
+    
+    merged_tree = parse_text(merged_text)
+    
+    return merged_tree, was_conflict
 
 def get_service():
     """
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.