Docs: run convert-ly for 2.14.0.

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

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