Merge branch 'lsl' of http://yunpi.tpddns.cn:3000/lisl/gitTest.git into

lsl Conflicts: src/gitTest/Test.java
Test_rebase
1 changed files with 6 additions and 0 deletions
--- a/src/gitTest/Test.java
+++ b/src/gitTest/Test.java
@ -16,4 +16,10 @@ public class Test {
    	System.out.println("Test_cherry_pick");
    }
    
+    public static void  Test_rebase (){
+    	System.out.println("Test_rebase");
+    }
+    
+
+    
 }
Author	SHA1	Message	Date
李双龙	42c7234a4b	Merge branch 'lsl' of http://yunpi.tpddns.cn:3000/lisl/gitTest.git into lsl Conflicts: src/gitTest/Test.java	9 months ago
李双龙	4f8394ad0f	Test_rebase	9 months ago
李双龙	b0385b24a7	Test_cherry_pick	9 months ago