X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fcollision-heads.ly;h=23725036110053a19a317eb787a106e59f358b81;hb=fdc410ddf1a25df4a7a1cdf8af05d20f1d003a1d;hp=0db80feee4123dfc8a19fc91de371b0014cf80f5;hpb=11613b92019bb42418863f43de92287a64878f14;p=lilypond.git

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index 0db80feee4..2372503611 100644
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,34 +1,18 @@
-#(ly:set-option 'old-relative)
-\version "1.9.2"
+\version "2.10.0"
 \header {
-    texidoc =
-
-    "If @code{merge-differently-headed}, then
-open note heads may be merged with black noteheads, but only
-if the black note heads are from 8th or shorter notes.
-"
-    
+  texidoc =
+  "Open and black note heads are not merged by default."
+  
 }
-    \paper { raggedright= ##t }
+
+\layout { ragged-right= ##t }
 
 
-\score { \notes \context Staff\relative c''<
-\new Voice {
-    \voiceOne
+\context Staff  \relative c'' <<
+  {
     c2 c8 c4.
-    
-    \property Staff.NoteCollision \override #'merge-differently-headed = ##t
-    c2
-    c8 c4.
-    c2
-}
-\new Voice {
-    \voiceTwo
-    c8 c4.
-    c2
-    c8 c4.
-    c2
-    c4
-}
-    >
-	 }
+  }\\
+  {
+    c8 c4. c2
+  }
+>>