From 2f4b6f476a8084da7332bea720d1f24d84915f32 Mon Sep 17 00:00:00 2001
From: Renato Cavalcanti <renato@cavalcanti.be>
Date: Thu, 19 Dec 2019 08:21:28 +0100
Subject: [PATCH] clarify message on sbt.version mismatch

---
 main/src/main/scala/sbt/Main.scala                    | 4 ++--
 sbt/src/sbt-test/project/sbt-version-change/build.sbt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/src/main/scala/sbt/Main.scala b/main/src/main/scala/sbt/Main.scala
index d570e6bba..07cfbec51 100644
--- a/main/src/main/scala/sbt/Main.scala
+++ b/main/src/main/scala/sbt/Main.scala
@@ -827,8 +827,8 @@ object BuiltinCommands {
     sbtVersionOpt.foreach(
       version =>
         if (version != app.id.version()) {
-          state.log.warn(s"""sbt version mismatch, current: ${app.id
-            .version()}, in build.properties: "$version", use 'reboot' to use the new value.""")
+          state.log.warn(s"""sbt version mismatch, using: ${app.id
+            .version()}, in build.properties: "$version".""")
         }
     )
   }
diff --git a/sbt/src/sbt-test/project/sbt-version-change/build.sbt b/sbt/src/sbt-test/project/sbt-version-change/build.sbt
index 8bc0b3ddf..6d9dc4e80 100644
--- a/sbt/src/sbt-test/project/sbt-version-change/build.sbt
+++ b/sbt/src/sbt-test/project/sbt-version-change/build.sbt
@@ -3,6 +3,6 @@ TaskKey[Unit]("checkSbtVersionWarning") := {
 	val logging = state.globalLogging
 	val currVersion = state.configuration.provider.id.version()
 	val contents = IO.read(logging.backing.file)
-	assert(contents.contains(s"""sbt version mismatch, current: $currVersion, in build.properties: "1.1.1", use 'reboot' to use the new value."""))
+	assert(contents.contains(s"""sbt version mismatch, using: $currVersion, in build.properties: "1.1.1"."""))
 	()
 }
\ No newline at end of file