merge with no-ff

2024-07-23 11:23:33 +08:00 · 2024-07-23 11:23:33 +08:00 · cd531a82df
commit cd531a82df
parent 0d5375b087 bdf65cd85d
1 changed files with 1 additions and 0 deletions
--- a/gittest.md
+++ b/gittest.md
@ -1,2 +1,3 @@
 # 这是一个测试文件的测试
 冲突测试master 和 冲突测试dev1
+分支策略。。。测试