2 changed files with 6 additions and 0 deletions
--- a/doc/git-test.txt
+++ b/doc/git-test.txt
@ -1 +1,6 @@
+<<<<<<< HEAD
+这是一个Git测试文件
+这是一个zhanglin_branch分支添加的内容
+=======
 这是一个master分支添加的内容
+>>>>>>> master
--- a/src/DateTimePickerDialog.java
+++ b/src/DateTimePickerDialog.java
@ -0,0 +1 @@
+//This is a test comment