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

Merge commit '1b593e1ea4d2af0f6444d9a7788d5d99abd6fde5' as 'third_party/git'

12 files changed, 88 insertions, 0 deletions

diff --git a/third_party/git/t/t4101/diff.0-1 b/third_party/git/t/t4101/diff.0-1
new file mode 100644
index 000000000000..1010a88f4727
--- /dev/null
+++ b/third_party/git/t/t4101/diff.0-1
@@ -0,0 +1,6 @@
+--- a/frotz
++++ b/frotz
+@@ -1,2 +1,3 @@
+ a
+ b
++c
diff --git a/third_party/git/t/t4101/diff.0-2 b/third_party/git/t/t4101/diff.0-2
new file mode 100644
index 000000000000..36460a243ac1
--- /dev/null
+++ b/third_party/git/t/t4101/diff.0-2
@@ -0,0 +1,7 @@
+--- a/frotz
++++ b/frotz
+@@ -1,2 +1,2 @@
+ a
+-b
++b
+\ No newline at end of file
diff --git a/third_party/git/t/t4101/diff.0-3 b/third_party/git/t/t4101/diff.0-3
new file mode 100644
index 000000000000..b281c43e5b5f
--- /dev/null
+++ b/third_party/git/t/t4101/diff.0-3
@@ -0,0 +1,8 @@
+--- a/frotz
++++ b/frotz
+@@ -1,2 +1,3 @@
+ a
+-b
++c
++b
+\ No newline at end of file
diff --git a/third_party/git/t/t4101/diff.1-0 b/third_party/git/t/t4101/diff.1-0
new file mode 100644
index 000000000000..f0a2e9277087
--- /dev/null
+++ b/third_party/git/t/t4101/diff.1-0
@@ -0,0 +1,6 @@
+--- a/frotz
++++ b/frotz
+@@ -1,3 +1,2 @@
+ a
+ b
+-c
diff --git a/third_party/git/t/t4101/diff.1-2 b/third_party/git/t/t4101/diff.1-2
new file mode 100644
index 000000000000..2a440a5ce2ad
--- /dev/null
+++ b/third_party/git/t/t4101/diff.1-2
@@ -0,0 +1,8 @@
+--- a/frotz
++++ b/frotz
+@@ -1,3 +1,2 @@
+ a
+-b
+-c
++b
+\ No newline at end of file
diff --git a/third_party/git/t/t4101/diff.1-3 b/third_party/git/t/t4101/diff.1-3
new file mode 100644
index 000000000000..61aff975b69f
--- /dev/null
+++ b/third_party/git/t/t4101/diff.1-3
@@ -0,0 +1,8 @@
+--- a/frotz
++++ b/frotz
+@@ -1,3 +1,3 @@
+ a
+-b
+ c
++b
+\ No newline at end of file
diff --git a/third_party/git/t/t4101/diff.2-0 b/third_party/git/t/t4101/diff.2-0
new file mode 100644
index 000000000000..c2e71ee344d0
--- /dev/null
+++ b/third_party/git/t/t4101/diff.2-0
@@ -0,0 +1,7 @@
+--- a/frotz
++++ b/frotz
+@@ -1,2 +1,2 @@
+ a
+-b
+\ No newline at end of file
++b
diff --git a/third_party/git/t/t4101/diff.2-1 b/third_party/git/t/t4101/diff.2-1
new file mode 100644
index 000000000000..a66d9fd3a137
--- /dev/null
+++ b/third_party/git/t/t4101/diff.2-1
@@ -0,0 +1,8 @@
+--- a/frotz
++++ b/frotz
+@@ -1,2 +1,3 @@
+ a
+-b
+\ No newline at end of file
++b
++c
diff --git a/third_party/git/t/t4101/diff.2-3 b/third_party/git/t/t4101/diff.2-3
new file mode 100644
index 000000000000..5633c831de0b
--- /dev/null
+++ b/third_party/git/t/t4101/diff.2-3
@@ -0,0 +1,7 @@
+--- a/frotz
++++ b/frotz
+@@ -1,2 +1,3 @@
+ a
++c
+ b
+\ No newline at end of file
diff --git a/third_party/git/t/t4101/diff.3-0 b/third_party/git/t/t4101/diff.3-0
new file mode 100644
index 000000000000..10b1a41edf73
--- /dev/null
+++ b/third_party/git/t/t4101/diff.3-0
@@ -0,0 +1,8 @@
+--- a/frotz
++++ b/frotz
+@@ -1,3 +1,2 @@
+ a
+-c
+-b
+\ No newline at end of file
++b
diff --git a/third_party/git/t/t4101/diff.3-1 b/third_party/git/t/t4101/diff.3-1
new file mode 100644
index 000000000000..c799c60fb9d4
--- /dev/null
+++ b/third_party/git/t/t4101/diff.3-1
@@ -0,0 +1,8 @@
+--- a/frotz
++++ b/frotz
+@@ -1,3 +1,3 @@
+ a
++b
+ c
+-b
+\ No newline at end of file
diff --git a/third_party/git/t/t4101/diff.3-2 b/third_party/git/t/t4101/diff.3-2
new file mode 100644
index 000000000000..f8d1ba6dc246
--- /dev/null
+++ b/third_party/git/t/t4101/diff.3-2
@@ -0,0 +1,7 @@
+--- a/frotz
++++ b/frotz
+@@ -1,3 +1,2 @@
+ a
+-c
+ b
+\ No newline at end of file