diff --git a/.3.txt b/.3.txt index 7a2250b..758d9b7 100644 --- a/.3.txt +++ b/.3.txt @@ -1,2 +1,2 @@ .3.3.3.3 -fenzhi3修改 \ No newline at end of file +第二行来自fenzhi3修改,另一种来自fenzhi4修改 diff --git a/conflict.txt b/conflict.txt new file mode 100644 index 0000000..cd24ed3 --- /dev/null +++ b/conflict.txt @@ -0,0 +1,2 @@ +这是fenzhi4分支的内容 +第二行内容 \ No newline at end of file