From f1337a09db9f70b1ed23b15711a51d4eb72781bb Mon Sep 17 00:00:00 2001
From: fqx <qingxufan0923@163.com>
Date: Mon, 22 Nov 2021 14:42:01 +0800
Subject: [PATCH] develop merge feature before2

---
 test.js |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/test.js b/test.js
index d36a5f8..b4649d8 100644
--- a/test.js
+++ b/test.js
@@ -1 +1,8 @@
-test.fsdf
\ No newline at end of file
+gittest.fsdf
+
+feature1
+
+feature:rebase
+
+feature:merge
+

--
Gitblit v1.9.1