From af067e3849e30096c96f15fa0155d8cd43fd931a Mon Sep 17 00:00:00 2001 From: TestUser Date: Tue, 20 Jul 2021 14:56:35 +0800 Subject: [PATCH 1/2] updated again --- new.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/new.txt b/new.txt index d650928..c17e64c 100644 --- a/new.txt +++ b/new.txt @@ -3,3 +3,5 @@ the first linf in this file. this is a new line. updated from upstream + +updated again from local. From cddaffce61ba24fd67523e6333783ad326b74530 Mon Sep 17 00:00:00 2001 From: TestUser Date: Tue, 20 Jul 2021 15:16:53 +0800 Subject: [PATCH 2/2] removed 1 file --- new.txt | 7 ------- 1 file changed, 7 deletions(-) delete mode 100644 new.txt diff --git a/new.txt b/new.txt deleted file mode 100644 index c17e64c..0000000 --- a/new.txt +++ /dev/null @@ -1,7 +0,0 @@ -the first linf in this file. - -this is a new line. - -updated from upstream - -updated again from local.