From 99e023c0e3d5079ae8cd798ee2ecad79e4cc2976 Mon Sep 17 00:00:00 2001 From: Santhosh Date: Thu, 24 Feb 2022 17:56:58 +0000 Subject: [PATCH 1/3] adding file1 --- file1 | 1 + 1 file changed, 1 insertion(+) create mode 100644 file1 diff --git a/file1 b/file1 new file mode 100644 index 0000000..16b14f5 --- /dev/null +++ b/file1 @@ -0,0 +1 @@ +test file From ab25def0ae744e9030525086d1036e9af6111b2f Mon Sep 17 00:00:00 2001 From: Santhosh Date: Thu, 24 Feb 2022 18:04:20 +0000 Subject: [PATCH 2/3] adding file4 from b3 --- file4 | 1 + 1 file changed, 1 insertion(+) create mode 100644 file4 diff --git a/file4 b/file4 new file mode 100644 index 0000000..9daeafb --- /dev/null +++ b/file4 @@ -0,0 +1 @@ +test From 5e0d4cb353792802b7919402f3c47d1be4cebaee Mon Sep 17 00:00:00 2001 From: Santhosh Date: Thu, 24 Feb 2022 18:42:12 +0000 Subject: [PATCH 3/3] adding second line to file4 --- file4 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/file4 b/file4 index 9daeafb..5f1adc6 100644 --- a/file4 +++ b/file4 @@ -1 +1,3 @@ test + +this line to test merging from b3