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

Merge commit '1b593e1ea4' as 'third_party/git'
2020-01-11 23:36:56 +00:00 · 2020-01-11 23:36:56 +00:00 · 7ef0d62730
commit 7ef0d62730
parent 6a2a300707 1b593e1ea4
3629 changed files with 1139935 additions and 0 deletions
--- a/third_party/git/t/t4013/diff.diff_master_master^_side
+++ b/third_party/git/t/t4013/diff.diff_master_master^_side
@ -0,0 +1,29 @@
+$ git diff master master^ side
+diff --cc dir/sub
+index cead32e,7289e35..992913c
+--- a/dir/sub
+++ b/dir/sub
+@@@ -1,6 -1,4 +1,8 @@@
+  A
+  B
+ +C
+ +D
+ +E
+ +F
+ 1
+ 2
+diff --cc file0
+index b414108,f4615da..10a8a9f
+--- a/file0
+++ b/file0
+@@@ -1,6 -1,6 +1,9 @@@
+  1
+  2
+  3
+ +4
+ +5
+ +6
+ A
+ B
+ C
+$