lib/trac-wiki/parser.rb in trac-wiki-0.1.7 vs lib/trac-wiki/parser.rb in trac-wiki-0.1.8

@@ -488,14 +488,15 @@
         when math? && str =~ /\A\$\$(.*?)\$\$/m
           end_paragraph
           nowikiblock = make_nowikiblock($1)
           @out << "$$" << escape_html(nowikiblock) << "$$\n"
           @was_math = true
-        when merge? && str =~ /\A(<<<<<<<|=======|>>>>>>>)\s+(\S+).*$(\r?\n)?/
+        when merge? && str =~ /\A(<{7}|={7}|>{7}|\|{7}) *(\S*).*$(\r?\n)?/
           who = $2
           merge_class = case $1[0]
                           when '<' ; 'merge-mine'
-                          when '=' ; 'merge-orig'
+                          when '=' ; 'merge-split'
+                          when '|' ; 'merge-orig'
                           when '>' ; 'merge-your'
                         end
           end_paragraph
           @out << "<div class='merge #{merge_class}'>" << escape_html(who) << "</div>\n"
         when str =~ /\A\{\{\{\r?\n(.*?)\r?\n\}\}\}/m