From 8499b08dfe475ed6292d2af0a9b8bfb9c33e627b Mon Sep 17 00:00:00 2001 From: liuxintong <2310364@mail.nankai.edu.cn> Date: Sun, 17 May 2026 14:54:18 +0800 Subject: [PATCH 1/2] Update 4 files on branch C4 --- file1.txt | 1 + file2.txt | 1 + file3.txt | 1 + file4.txt | 1 + temp.txt | 1 + temp2.txt | 1 + 6 files changed, 6 insertions(+) create mode 100644 temp.txt create mode 100644 temp2.txt diff --git a/file1.txt b/file1.txt index e69de29..196d196 100644 --- a/file1.txt +++ b/file1.txt @@ -0,0 +1 @@ +ouhayou,hajimi! \ No newline at end of file diff --git a/file2.txt b/file2.txt index e69de29..26726b2 100644 --- a/file2.txt +++ b/file2.txt @@ -0,0 +1 @@ +ouhayou xuezhang! \ No newline at end of file diff --git a/file3.txt b/file3.txt index e69de29..59404a9 100644 --- a/file3.txt +++ b/file3.txt @@ -0,0 +1 @@ +today is your deadline! \ No newline at end of file diff --git a/file4.txt b/file4.txt index e69de29..bc01f59 100644 --- a/file4.txt +++ b/file4.txt @@ -0,0 +1 @@ +please help me! \ No newline at end of file diff --git a/temp.txt b/temp.txt new file mode 100644 index 0000000..f691d92 --- /dev/null +++ b/temp.txt @@ -0,0 +1 @@ +今天星期日,北京阴雨,我想睡到下午两点钟,但是我必须写实验报告。 \ No newline at end of file diff --git a/temp2.txt b/temp2.txt new file mode 100644 index 0000000..993c92c --- /dev/null +++ b/temp2.txt @@ -0,0 +1 @@ +today is my birthday.i'm cooking with my husband. \ No newline at end of file From 7e006780a78472010fc9c088726f494b6c83147d Mon Sep 17 00:00:00 2001 From: liuxintong <2310364@mail.nankai.edu.cn> Date: Sun, 17 May 2026 14:58:21 +0800 Subject: [PATCH 2/2] Update the same 4 files differently on branch3 --- file1.txt | 1 + file2.txt | 1 + file3.txt | 1 + file4.txt | 1 + 4 files changed, 4 insertions(+) diff --git a/file1.txt b/file1.txt index e69de29..2fd405f 100644 --- a/file1.txt +++ b/file1.txt @@ -0,0 +1 @@ +你好呀 hajimi! \ No newline at end of file diff --git a/file2.txt b/file2.txt index e69de29..8e70679 100644 --- a/file2.txt +++ b/file2.txt @@ -0,0 +1 @@ +你好呀学长! \ No newline at end of file diff --git a/file3.txt b/file3.txt index e69de29..8adf3f8 100644 --- a/file3.txt +++ b/file3.txt @@ -0,0 +1 @@ +今天是你的 DDL! \ No newline at end of file diff --git a/file4.txt b/file4.txt index e69de29..89a733f 100644 --- a/file4.txt +++ b/file4.txt @@ -0,0 +1 @@ +ouno! \ No newline at end of file