X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fcollision-heads.ly;h=1a0a9fba83ee3708cb7960ccf96bd299ddc198ad;hb=53ab418e0bb8f272082db295b38a1dbb2ccfca65;hp=38097fe74d65e74b9977ce78039ba434657f77d1;hpb=be9d398d705ecf2308e10864e37c6f1315c78ec9;p=lilypond.git

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index 38097fe74d..1a0a9fba83 100644
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,30 +1,18 @@
-\version "1.5.68"
+\version "2.14.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."
+  
 }
-\score { \notes \context Staff\relative c''<
-\context Voice = VA {
-    \voiceOne
+
+\layout { ragged-right= ##t }
+
+
+\context Staff  \relative c'' <<
+  {
     c2 c8 c4.
-    
-    \property Staff.NoteCollision \override #'merge-differently-headed = ##t
-    c2
-    c8 c4.
-    c2
-}
-\context Voice = VB {
-    \voiceTwo
-    c8 c4.
-    c2
-    c8 c4.
-    c2
-    c4
-}
-    >
-	 }
+  }\\
+  {
+    c8 c4. c2
+  }
+>>