From 7617bad67845c647a012e4172d331aff321870ec Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 6 Apr 2018 18:45:34 +0800 Subject: [PATCH 1/3] f1 f1 patch --- file1 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/file1 b/file1 index ad47f63..a3c8f82 100644 --- a/file1 +++ b/file1 @@ -4,3 +4,5 @@ line3 line4 line5 a change to files 1 +file 1 change +patch added here From 22d90f19d08f842f8ba0e392709c8c2a98ed4f2a Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 6 Apr 2018 18:46:52 +0800 Subject: [PATCH 2/3] f2 changes cherry picked over from "update" branch --- file2 | 1 + 1 file changed, 1 insertion(+) diff --git a/file2 b/file2 index e052ffa..a44a888 100644 --- a/file2 +++ b/file2 @@ -3,3 +3,4 @@ line2 line3 line4 a change made here +file 2 change From acdaf16faac3c851d999f9da79a90778914d330b Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 6 Apr 2018 18:47:20 +0800 Subject: [PATCH 3/3] f2 patch --- file2 | 1 + 1 file changed, 1 insertion(+) diff --git a/file2 b/file2 index a44a888..df3e199 100644 --- a/file2 +++ b/file2 @@ -4,3 +4,4 @@ line3 line4 a change made here file 2 change +file 2 patch