X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=input%2Fregression%2Fcollision-heads.ly;h=11387aecf33893a8366b58a039097f31e54cf444;hb=ee2b8247bc571823c275463c4b477591986a7e9d;hp=a4f21338d82b5fe94e271582a1dc7d9910c0cb6b;hpb=72972afb27cf99f5ae432f4a1463d4f6de6107a0;p=lilypond.git

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index a4f21338d8..11387aecf3 100644
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,31 +1,18 @@
-\version "1.7.16"
+\version "2.12.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
-}
-    >
-	 }
-%% new-chords-done %%
\ No newline at end of file
+  }\\
+  {
+    c8 c4. c2
+  }
+>>