Squashed 'third_party/git/' content from commit cb71568594
git-subtree-dir: third_party/git git-subtree-split: cb715685942260375e1eb8153b0768a376e4ece7
This commit is contained in:
commit
1b593e1ea4
3629 changed files with 1139935 additions and 0 deletions
80
t/t4013/diff.diff-tree_-p_-m_master
Normal file
80
t/t4013/diff.diff-tree_-p_-m_master
Normal file
|
|
@ -0,0 +1,80 @@
|
|||
$ git diff-tree -p -m master
|
||||
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index cead32e..992913c 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -4,3 +4,5 @@ C
|
||||
D
|
||||
E
|
||||
F
|
||||
+1
|
||||
+2
|
||||
diff --git a/file0 b/file0
|
||||
index b414108..10a8a9f 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -4,3 +4,6 @@
|
||||
4
|
||||
5
|
||||
6
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
59d314ad6f356dd08601a4cd5e530381da3e3c64
|
||||
diff --git a/dir/sub b/dir/sub
|
||||
index 7289e35..992913c 100644
|
||||
--- a/dir/sub
|
||||
+++ b/dir/sub
|
||||
@@ -1,4 +1,8 @@
|
||||
A
|
||||
B
|
||||
+C
|
||||
+D
|
||||
+E
|
||||
+F
|
||||
1
|
||||
2
|
||||
diff --git a/file0 b/file0
|
||||
index f4615da..10a8a9f 100644
|
||||
--- a/file0
|
||||
+++ b/file0
|
||||
@@ -1,6 +1,9 @@
|
||||
1
|
||||
2
|
||||
3
|
||||
+4
|
||||
+5
|
||||
+6
|
||||
A
|
||||
B
|
||||
C
|
||||
diff --git a/file1 b/file1
|
||||
new file mode 100644
|
||||
index 0000000..b1e6722
|
||||
--- /dev/null
|
||||
+++ b/file1
|
||||
@@ -0,0 +1,3 @@
|
||||
+A
|
||||
+B
|
||||
+C
|
||||
diff --git a/file2 b/file2
|
||||
deleted file mode 100644
|
||||
index 01e79c3..0000000
|
||||
--- a/file2
|
||||
+++ /dev/null
|
||||
@@ -1,3 +0,0 @@
|
||||
-1
|
||||
-2
|
||||
-3
|
||||
diff --git a/file3 b/file3
|
||||
deleted file mode 100644
|
||||
index 7289e35..0000000
|
||||
--- a/file3
|
||||
+++ /dev/null
|
||||
@@ -1,4 +0,0 @@
|
||||
-A
|
||||
-B
|
||||
-1
|
||||
-2
|
||||
$
|
||||
Loading…
Add table
Add a link
Reference in a new issue