From 190accc59e3a1db75cc8f93595981cde0ca76ef1 Mon Sep 17 00:00:00 2001
From: Miku-he <1319265705@qq.com>
Date: Fri, 10 Jun 2022 09:53:09 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E8=AF=95rebase=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vuex_demo1/test.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/vuex_demo1/test.txt b/vuex_demo1/test.txt
index 9a18cc2..b1211c6 100644
--- a/vuex_demo1/test.txt
+++ b/vuex_demo1/test.txt
@@ -1,4 +1,4 @@
 测试远程dev分支
 主分支修改
-测试合并
+test git pull rebase
 update dev