resolve merge

[lilypond.git] / input / regression / beam-collision-large-object.ly

diff --git a/input/regression/beam-collision-large-object.ly b/input/regression/beam-collision-large-object.ly
new file mode 100644 (file)
index 0000000..f2f9f0f
--- /dev/null
+++ b/input/regression/beam-collision-large-object.ly
@@ -0,0 +1,15 @@
+\header {
+  texidoc = "Behave sensibly in the presence of large collisions."
+}
+
+\version "2.14.0"
+\new Staff {
+  <<
+    { \voiceOne s2 }
+    \\
+    { \voiceTwo e4 e }
+    \\
+    { \voiceFour
+      f''8[ e'' gis'' gis''] }
+  >>
+}