resolve merge

[lilypond.git] / input / regression / beaming-ternary-metrum.ly

diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly
index 907edf10f43672073725ac0979c9e3246aa61981..cf9957e036998542a0a28c42671feafdec7cb843 100644 (file)
--- a/input/regression/beaming-ternary-metrum.ly
+++ b/input/regression/beaming-ternary-metrum.ly
@@ -1,12 +1,11 @@
 
-\version "2.12.0"
+\version "2.14.0"
 
 \header {
 
-  texidoc = "Automatic beaming works also in ternary time sigs. In
-  this case, the 8th is a beat, so the 16ths are split into two
-  groups.  This can be avoided by overriding @code{beatLength} to be
-  three 8th notes."
+  texidoc = "Automatic beaming works also in ternary time sigs.
+  As desired, the measure is split in half, with beats 1-3 and
+  4-6 beamed together as a whole."
 
 }
 
@@ -14,8 +13,7 @@
 
 \relative c'' {
   \time 6/8
-  c8.[ c16 c16 c16] 
-  \set beatLength = #(ly:make-moment 3 8)
-  c8.[ c16 c16 c16] 
+  c8. c16 c16 c16
+  c8. c16 c16 c16
 }