Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / input / regression / collision-heads.ly

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index 8e5c9860b8a5047634fdf712261fdb34dc81ea75..11387aecf33893a8366b58a039097f31e54cf444 100644 (file)
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,11 +1,7 @@
-\version "2.7.32"
+\version "2.12.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.
-"
+  "Open and black note heads are not merged by default."
   
 }
 
@@ -15,15 +11,8 @@ if the black note heads are from 8th or shorter notes.
 \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
   }
 >>