0
@@ -104,7 +104,9 @@ module Parsers
0
     output = {:text => "", :conflicts => []}
0
     input.split("\n").each do |line|
0
       case line
0
-      when /^CONFLICT \(.+\): Merge conflict in (.+)$/
0
+      when /^CONFLICT \(.+?\): Merge conflict in (.+)/
0
+        output[:conflicts] << $1
0
+      when /^CONFLICT \(delete\/modify\): (.+) deleted in /
0
         output[:conflicts] << $1
0
       else
0
         output[:text] << "#{line}\n"

0
@@ -13,9 +13,13 @@ Auto-merged project.txt
0
 CONFLICT (content): Merge conflict in project.txt
0
 Auto-merged dude.txt
0
 CONFLICT (add/add): Merge conflict in dude.txt
0
+CONFLICT (delete/modify): lib/file.rb deleted in HEAD and modified in release. Version release of lib/file.rb left in tree.
0
+Auto-merged spec/fixtures/events.yml
0
+CONFLICT (delete/modify): coso.txt deleted in release and modified in HEAD. Version HEAD of coso.txt left in tree.
0
+Automatic merge failed; fix conflicts and then commit the result.
0
 Automatic merge failed; fix conflicts and then commit the result.
0
 EOF
0
     # puts result.inspect
0
-    result[:conflicts].should == ["project.txt", "dude.txt"]
0
+    result[:conflicts].should == ["project.txt", "dude.txt", "lib/file.rb", "coso.txt"]
0
   end
0
 end
0
\ No newline at end of file