From 82c7154abe41e87176bc6b90c51098f82d80bf46 Mon Sep 17 00:00:00 2001
From: fqx <qingxufan0923@163.com>
Date: Tue, 23 Nov 2021 10:13:38 +0800
Subject: [PATCH] Merge branch 'feature'

---
 test.js |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/test.js b/test.js
index 4c43c72..f6b8bd4 100644
--- a/test.js
+++ b/test.js
@@ -1,5 +1,13 @@
+test.fsdf
+1
+
+hotfix_version1_0_2
+bug:detail
+
+merge:fast-forward
+ 1
+
 gittest.fsdf
 
 feature1
-
-feature:rebase
\ No newline at end of file
+123
\ No newline at end of file

--
Gitblit v1.9.1