donald 0.1.2 → 0.1.3

data/lib/donald/merge_tool.rb

@@ -30,14 +30,25 @@ module Donald
       files = []
       
       text.each_line do |line|
-        if line.match /unmerged: (.*)/
-          files << $1.strip
-        end
+        file = conflicted_file(line)
+        files << file unless file.nil?
       end
       
       files
     end
     
+    def conflicted_file line      
+      conflicted_types = ['unmerged', 'both modified']
+      
+      conflicted_types.each do |conflicted_type|
+        if line.match /#{conflicted_type}: (.*)/
+          return $1.strip
+        end
+      end
+      
+      nil
+    end
+    
     def call_vim files
       editor = @options[:editor] || DEFAULT_EDITOR
       

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: donald
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Bruno Grasselli
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-03 00:00:00 -03:00
+date: 2010-04-21 00:00:00 -03:00
 default_executable: donald
 dependencies: []