resolve merge

[lilypond.git] / input / regression / accidental-clef-change.ly

diff --git a/input/regression/accidental-clef-change.ly b/input/regression/accidental-clef-change.ly
index c927e693f723a7b6515d9fa08b3365a6cf13f037..c2e78f492521d434a74301c5942a158336085b6a 100644 (file)
--- a/input/regression/accidental-clef-change.ly
+++ b/input/regression/accidental-clef-change.ly
@@ -1,5 +1,5 @@
 \header {
-  texidoc = "Accidentals are reset for clef changes."
+  texidoc = "Accidentals are invalidated at clef changes."
 }
 
 \layout {
@@ -7,11 +7,12 @@
 }
 
 
-\version "2.12.0"
+\version "2.14.0"
 \new Staff \relative c' {
+    \key g\major
     \clef treble
-    cis dis fis
+    cis dis f
     \clef bass
-    <cis dis fis gis>
+    <c dis fis>
 }