X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fcollision-heads.ly;h=1a0a9fba83ee3708cb7960ccf96bd299ddc198ad;hb=2055f35c47a045a50a01ff4dba8524322cfc3b48;hp=f3a17595dbdd312bfe4edb642e61908c498d5035;hpb=3684e949054183e4a31e17f5e7ab0bf30da0123e;p=lilypond.git

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index f3a17595db..1a0a9fba83 100644
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,31 +1,18 @@
-\version "2.2.0"
+\version "2.14.0"
 \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."
+  
 }
 
-\paper { raggedright= ##t }
+\layout { ragged-right= ##t }
 
 
-\score {
-    \context Staff \notes \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'' <<
+  {
+    c2 c8 c4.
+  }\\
+  {
+    c8 c4. c2
+  }
+>>