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

lsl

Conflicts:
	src/gitTest/Test.java

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");
+    }
+    
+
+    
 }