lib/braid/operations.rb in braid-1.0.7 vs lib/braid/operations.rb in braid-1.0.8

@@ -248,12 +248,11 @@
       # Implies no commit.
       def merge_subtree(opt)
         # TODO which options are needed?
         invoke(:merge, '-s subtree --no-commit --no-ff', opt)
         true
-      rescue ShellExecutionError
-        # TODO: Figure out how to pass along conflict messages.
-        raise MergeError, ''
+      rescue ShellExecutionError => error
+        raise MergeError, error.out
       end
 
       # Merge three trees (local_treeish should match the current state of the
       # index) and update the index and working tree.
       #