From 5e95af2bd1e4ce8041f48f4b39840c06bb40dd0c Mon Sep 17 00:00:00 2001
From: zhiyu1998 <542716863@qq.com>
Date: Wed, 7 Aug 2024 13:38:51 +0800
Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20feat:=20=E5=AE=8C=E5=96=84=E6=9B=B4?=
 =?UTF-8?q?=E6=96=B0=E6=8F=90=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 apps/update.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/update.js b/apps/update.js
index 0e8e62c..2049474 100644
--- a/apps/update.js
+++ b/apps/update.js
@@ -167,14 +167,14 @@ export class update extends plugin {
             await this.reply(
                 msg +
                 `存在冲突：\n${errMsg}\n` +
-                "请解决冲突后再更新，或者执行#强制更新，放弃本地修改",
+                "请解决冲突后再更新，或者执行#R强制更新，放弃本地修改",
             );
         } else if (stdout.includes("CONFLICT")) {
             await this.reply([
                 msg + "存在冲突\n",
                 errMsg,
                 stdout,
-                "\n请解决冲突后再更新，或者执行#强制更新，放弃本地修改",
+                "\n请解决冲突后再更新，或者执行#R强制更新，放弃本地修改",
             ]);
         } else {
             await this.reply([errMsg, stdout]);