Merge pull request '"在doc文件夹添加git-test.txt测试文件"' (#1 ) from zhanglin_branch into master

解决合并冲突：保留两个分支的修改
zhanglin_branch分支修改git-test.txt
2 changed files with 7 additions and 0 deletions
--- a/doc/git-test.txt
+++ b/doc/git-test.txt
@ -0,0 +1,6 @@
+<<<<<<< HEAD
+这是一个Git测试文件
+这是一个zhanglin_branch分支添加的内容
+=======
+这是一个master分支添加的内容
+>>>>>>> master
--- a/src/DateTimePickerDialog.java
+++ b/src/DateTimePickerDialog.java
@ -0,0 +1 @@
+//This is a test comment
Author	SHA1	Message	Date
pcf2z3p6h	c58ee9da31	Merge pull request '"在doc文件夹添加git-test.txt测试文件"' (#1 ) from zhanglin_branch into master	1 month ago
张琳	8e773def34	解决合并冲突：保留两个分支的修改	1 month ago
张琳	4386ff95ae	zhanglin_branch分支修改git-test.txt	1 month ago
张琳	fd2cd39948	master分支修改git-test.txt	1 month ago
张琳	b6768dd76f	在doc文件夹下创建git-test.txt测试文件	1 month ago
张琳	0461365a11	在zhanglin_branch分支上添加测试注释	1 month ago