0
@@ -86,10 +86,9 @@ class BranchController < ApplicationController
0
     puts "</pre>"
0
 
0
     unless result[:conflicts].empty?
0
-      puts "<h2>Conflicts - edit each of the following, resolve, commit, then merge again:</h2>"
0
+      puts "<h2>Conflicts - resolve each of the following then commit:</h2>"
0
       result[:conflicts].each do |conflicted_file|
0
         full_path = File.join(git.git_base, conflicted_file)
0
-        tm_open(full_path)
0
         puts "<div><a href='txmt://open?url=file://#{e_url full_path}'>#{conflicted_file}</a></div>"
0
       end
0
     end

0
@@ -108,9 +108,8 @@ module Parsers
0
         output[:conflicts] << $1
0
       when /^CONFLICT \(delete\/modify\): (.+) deleted in /
0
         output[:conflicts] << $1
0
-      else
0
-        output[:text] << "#{line}\n"
0
       end
0
+      output[:text] << "#{line}\n"
0
     end
0
     output
0
   end