trac-wiki 0.1.7 → 0.1.8

data/lib/trac-wiki/parser.rb

@@ -490,11 +490,12 @@ module TracWiki
           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

data/lib/trac-wiki/version.rb

@@ -1,3 +1,3 @@
 module TracWiki
-  VERSION = '0.1.7'
+  VERSION = '0.1.8'
 end

data/test/parser_test.rb

@@ -794,10 +794,14 @@ describe TracWiki::Parser do
     tc("<p><a href=\"a/b/c\">a/b/c</a></p>\n", "[[a/b/c]]", :no_escape => true)
   end
   it 'should support merge' do
-    tc "<div class='merge merge-orig'>original</div>\n", "======= original", :merge => true
+    tc "<div class='merge merge-orig'>orig</div>\n",     "||||||| orig", :merge => true
     tc "<div class='merge merge-mine'>mine</div>\n",     "<<<<<<< mine", :merge => true
     tc "<div class='merge merge-your'>your</div>\n",     ">>>>>>> your", :merge => true
     tc "<p>bhoj</p>\n<div class='merge merge-your'>your</div>\n<p>ahoj</p>\n",     "bhoj\n>>>>>>> your\nahoj", :merge => true
+    tc "<div class='merge merge-split'></div>\n<p>ahoj</p>\n", "=======\nahoj\n", :merge => true
+    tc "<div class='merge merge-split'>split</div>\n", "======= split", :merge => true
+
+    tc "<h6></h6><p>ahoj</p>\n", "=======\nahoj\n", :merge => false
   end
 end
 # vim: tw=0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trac-wiki
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
   prerelease: 
 platform: ruby
 authors: