maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge(third_party/git): Merge squashed git subtree at v2.23.0

Browse source 
Merge commit '1b593e1ea4' as 'third_party/git'
This commit is contained in:
Vincent Ambo 2020-01-11 23:36:56 +00:00
commit 7ef0d62730
3629 changed files with 1139935 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

20
third_party/git/t/t4110/expect vendored Normal file
View file

@ -0,0 +1,20 @@
a1
a11
a111
a1111
b1
b11
b111
b1111
b2
b22
b222
b2222
c1
c11
c111
c1111
c2
c22
c222
c2222

17
third_party/git/t/t4110/patch1.patch vendored Normal file
View file

@ -0,0 +1,17 @@
diff --git a/new.txt b/new.txt
new file mode 100644
--- /dev/null
+++ b/new.txt
@@ -0,0 +1,12 @@
+a1
+a11
+a111
+a1111
+b1
+b11
+b111
+b1111
+c1
+c11
+c111
+c1111

11
third_party/git/t/t4110/patch2.patch vendored Normal file
View file

@ -0,0 +1,11 @@
diff --git a/new.txt b/new.txt
--- a/new.txt
+++ b/new.txt
@@ -1,7 +1,3 @@
-a1
-a11
-a111
-a1111
b1
b11
b111

14
third_party/git/t/t4110/patch3.patch vendored Normal file
View file

@ -0,0 +1,14 @@
diff --git a/new.txt b/new.txt
--- a/new.txt
+++ b/new.txt
@@ -6,6 +6,10 @@
b11
b111
b1111
+b2
+b22
+b222
+b2222
c1
c11
c111

11
third_party/git/t/t4110/patch4.patch vendored Normal file
View file

@ -0,0 +1,11 @@
diff --git a/new.txt b/new.txt
--- a/new.txt
+++ b/new.txt
@@ -1,3 +1,7 @@
+a1
+a11
+a111
+a1111
b1
b11
b111

11
third_party/git/t/t4110/patch5.patch vendored Normal file
View file

@ -0,0 +1,11 @@
diff --git a/new.txt b/new.txt
--- a/new.txt
+++ b/new.txt
@@ -10,3 +10,7 @@
c11
c111
c1111
+c2
+c22
+c222
+c2222