Squashed 'third_party/git/' content from commit cb71568594

git-subtree-dir: third_party/git git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7
2020-01-11 23:36:56 +00:00 · 2020-01-11 23:36:56 +00:00 · 1b593e1ea4
commit 1b593e1ea4
3629 changed files with 1139935 additions and 0 deletions
--- a/t/t4013/diff.diff_master_master^_side
+++ b/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
+$