resolve merge

[lilypond.git] / input / regression / stem-tremolo-forced-dir.ly

diff --git a/input/regression/stem-tremolo-forced-dir.ly b/input/regression/stem-tremolo-forced-dir.ly
index 9b716b74c7105a8afaec24c848570dc5501a4c81..ba60b84ba2a9199a06f5495d906ff7363bcf7396 100644 (file)
--- a/input/regression/stem-tremolo-forced-dir.ly
+++ b/input/regression/stem-tremolo-forced-dir.ly
@@ -1,8 +1,16 @@
 
-\version "2.12.0"
+\version "2.14.0"
+
+\header {
+texidoc = "Tremolo works even when a stem is forced in a
+particular direction.
+"
+}
+
 \layout { ragged-right = ##t }
 \relative c 
 {
         \clef bass
        \stemUp f4 : 32
+       \stemDown g,4 : 32
 }