From 6be089f14324f824da4fe50d7512bc3265d44898 Mon Sep 17 00:00:00 2001 From: mandar242 Date: Thu, 26 Mar 2020 17:20:56 -0700 Subject: [PATCH 1/5] Adding a test file to new_branch Signed-off-by: mandar242 --- test | 1 + 1 file changed, 1 insertion(+) create mode 100644 test diff --git a/test b/test new file mode 100644 index 00000000..d73643ac --- /dev/null +++ b/test @@ -0,0 +1 @@ +some test file From f7f3a9cf5e5f8759a28fca0036a68a1b41816bb6 Mon Sep 17 00:00:00 2001 From: mandar242 Date: Thu, 26 Mar 2020 18:14:13 -0700 Subject: [PATCH 2/5] Adding another test file to new_branch Signed-off-by: mandar242 --- test1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 test1 diff --git a/test1 b/test1 new file mode 100644 index 00000000..d73643ac --- /dev/null +++ b/test1 @@ -0,0 +1 @@ +some test file From 230c9f54e8ccbbe4effb5340683abf284758ab2b Mon Sep 17 00:00:00 2001 From: mandar242 Date: Thu, 26 Mar 2020 18:18:28 -0700 Subject: [PATCH 3/5] Adding edit to test1 file Signed-off-by: mandar242 --- test1 | 1 + 1 file changed, 1 insertion(+) diff --git a/test1 b/test1 index d73643ac..ce7af2fc 100644 --- a/test1 +++ b/test1 @@ -1 +1,2 @@ some test file +test file with edit \ No newline at end of file From 67d9f460ad0d0891a55b4945f61188c249220135 Mon Sep 17 00:00:00 2001 From: Farida Date: Thu, 1 Aug 2024 16:40:04 +0300 Subject: [PATCH 4/5] added text --- test | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test b/test index d73643ac..289cd47e 100644 --- a/test +++ b/test @@ -1 +1 @@ -some test file +some extra text From c7db68d55ba637bf6a2db002d56d5416139ecb6d Mon Sep 17 00:00:00 2001 From: Farida Date: Thu, 1 Aug 2024 17:13:55 +0300 Subject: [PATCH 5/5] new text --- test | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/test b/test index 4c0d2a12..17fa2ac1 100644 --- a/test +++ b/test @@ -1,5 +1,5 @@ -<<<<<<< HEAD + some extra text -======= + Some test file ->>>>>>> db494b56c09a466f3ba3e8b7aca00a3b27615a84 +