X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fcollision-heads.ly;h=b1d9b1e598d5e87c5de8212a40bb7fb4a8fcbf91;hb=97a0169312a260933246ab224e4f8b0969871dd5;hp=1196af6019b475a55280028284be446224156922;hpb=641486a1a5522a9e66b470d8c762a1f789219573;p=lilypond.git

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index 1196af6019..b1d9b1e598 100644
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,31 +1,18 @@
-\version "2.4.0"
+\version "2.19.21"
 \header {
-    texidoc =
-
-    "If @code{merge-differently-headed} is enabled, 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."
+  
 }
 
-\layout { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
-\score {
-    \context Staff  \relative c'' <<
-	{
-	    c2 c8 c4.
-	    
-	    \override Staff.NoteCollision  #'merge-differently-headed = ##t
-	    c2 c8 c4.
-	    c2
-	}\\
-	{
-	    c8 c4. c2
-	    
-	    c8 c4. c2
-	    c4
-	}
-    >>
-}
+\context Staff  \relative <<
+  {
+    c''2 c8 c4.
+  }\\
+  {
+    c8 c4. c2
+  }
+>>