Merge branch 'accepts'

[lilypond.git] / input / regression / collision-merge-differently-dotted.ly

diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly
index e0bfb514f3624ffe2e92a5427c6cd4b49cb97c6a..ba08617dc8f0a52f15c87f8ef87761cec5e6b137 100644 (file)
--- a/input/regression/collision-merge-differently-dotted.ly
+++ b/input/regression/collision-merge-differently-dotted.ly
@@ -1,13 +1,14 @@
-\version "2.6.0"
+\version "2.10.0"
 \header {
     
-    texidoc = "If NoteCollision has merge-differently-dotted = ##t note
+    texidoc = "If @code{NoteCollision} has
+ @code{merge-differently-dotted = ##t} note
 heads that have differing dot counts may be merged anyway.  Dots
 should not disappear when merging similar note heads."
     
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
        
 \context Staff \relative c'' <<
   {