From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Tue, 7 Nov 2006 17:07:23 +0000 (+0100)
Subject: trim example.
X-Git-Tag: release/2.10.0-2~31^2~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=bb931bde01b84a88d2789a639df4b5be134fa17f;p=lilypond.git

trim example.
---

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index adb2505364..5dc3a2c24e 100644
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,11 +1,7 @@
-\version "2.7.39"
+\version "2.9.29"
 \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
   }
 >>