trac-wiki 0.1.7 → 0.1.8
Sign up to get free protection for your applications and to get access to all the features.
- data/lib/trac-wiki/parser.rb +3 -2
- data/lib/trac-wiki/version.rb +1 -1
- data/test/parser_test.rb +5 -1
- metadata +1 -1
data/lib/trac-wiki/parser.rb
CHANGED
@@ -490,11 +490,12 @@ module TracWiki
|
|
490
490
|
nowikiblock = make_nowikiblock($1)
|
491
491
|
@out << "$$" << escape_html(nowikiblock) << "$$\n"
|
492
492
|
@was_math = true
|
493
|
-
when merge? && str =~ /\A(
|
493
|
+
when merge? && str =~ /\A(<{7}|={7}|>{7}|\|{7}) *(\S*).*$(\r?\n)?/
|
494
494
|
who = $2
|
495
495
|
merge_class = case $1[0]
|
496
496
|
when '<' ; 'merge-mine'
|
497
|
-
when '=' ; 'merge-
|
497
|
+
when '=' ; 'merge-split'
|
498
|
+
when '|' ; 'merge-orig'
|
498
499
|
when '>' ; 'merge-your'
|
499
500
|
end
|
500
501
|
end_paragraph
|
data/lib/trac-wiki/version.rb
CHANGED
data/test/parser_test.rb
CHANGED
@@ -794,10 +794,14 @@ describe TracWiki::Parser do
|
|
794
794
|
tc("<p><a href=\"a/b/c\">a/b/c</a></p>\n", "[[a/b/c]]", :no_escape => true)
|
795
795
|
end
|
796
796
|
it 'should support merge' do
|
797
|
-
tc "<div class='merge merge-orig'>
|
797
|
+
tc "<div class='merge merge-orig'>orig</div>\n", "||||||| orig", :merge => true
|
798
798
|
tc "<div class='merge merge-mine'>mine</div>\n", "<<<<<<< mine", :merge => true
|
799
799
|
tc "<div class='merge merge-your'>your</div>\n", ">>>>>>> your", :merge => true
|
800
800
|
tc "<p>bhoj</p>\n<div class='merge merge-your'>your</div>\n<p>ahoj</p>\n", "bhoj\n>>>>>>> your\nahoj", :merge => true
|
801
|
+
tc "<div class='merge merge-split'></div>\n<p>ahoj</p>\n", "=======\nahoj\n", :merge => true
|
802
|
+
tc "<div class='merge merge-split'>split</div>\n", "======= split", :merge => true
|
803
|
+
|
804
|
+
tc "<h6></h6><p>ahoj</p>\n", "=======\nahoj\n", :merge => false
|
801
805
|
end
|
802
806
|
end
|
803
807
|
# vim: tw=0
|