public
Description: The Git TextMate Bundle
Homepage: http://tim.theenchanter.com/
Clone URL: git://github.com/timcharper/git-tmbundle.git
merge command was a bit over-eager.  No longer auto opens conflicted 
files.  (maybe make this a configurable options?)
timcharper (author)
Mon Mar 10 09:40:40 -0700 2008
commit  7145b3ba4666544cc960e3b3c2899636b676c8aa
tree    725a8fddf14590216149d5730c6e856473a5a2a8
parent  8149d9ac8d710714680519bcc52c5e91de3a1bea
...
86
87
88
89
 
90
91
92
93
94
95
...
86
87
88
 
89
90
91
 
92
93
94
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
...
108
109
110
111
112
113
 
114
115
116
...
108
109
110
 
 
111
112
113
114
115
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

Comments

    No one has commented yet.