# removed in downstream (conflict)
ipdb> print merge_tree
removed in remote
base 100644 45b821b8bf36f577a0262155289c8423854f59f9 README.txt
our 100644 94a20afc02b51a1a8cc490006c0ae36d47d53507 README.txt
@@ -1,2 +0,0 @@
-Nothing here! -- Well, that's contradicts itself.
-change
# removed in upstream (conflict)
ipdb> print merge_tree
removed in local
base 100644 45b821b8bf36f577a0262155289c8423854f59f9 README.txt
their 100644 ab372b9c59e1c24deb7b414bd40f58558792e83c README.txt
# removed different files in both (no conflict when merging)
ipdb> print merge_tree
removed in remote
base 100644 7c046cc81752a6c1d841be9d3989563ea632bc32 README.md
our 100644 7c046cc81752a6c1d841be9d3989563ea632bc32 README.md
@@ -1,7 +0,0 @@
-http://jetmind.github.io/2014/02/08/memo-om.html
-
-Run
-===
-
-- `lein cljsbuild once`
-- open `index.html` with your browser.
removed in local
base 100644 45b821b8bf36f577a0262155289c8423854f59f9 README.txt
their 100644 45b821b8bf36f577a0262155289c8423854f59f9 README.txt