diff options
Diffstat (limited to 'third_party/git/t/t4013/diff.show_-m_master')
| -rw-r--r-- | third_party/git/t/t4013/diff.show_-m_master | 93 |
1 files changed, 0 insertions, 93 deletions
diff --git a/third_party/git/t/t4013/diff.show_-m_master b/third_party/git/t/t4013/diff.show_-m_master deleted file mode 100644 index 4ea2ee453d5e..000000000000 --- a/third_party/git/t/t4013/diff.show_-m_master +++ /dev/null @@ -1,93 +0,0 @@ -$ git show -m master -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0) -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -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 - -commit 59d314ad6f356dd08601a4cd5e530381da3e3c64 (from c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a) -Merge: 9a6d494 c7a2ab9 -Author: A U Thor <author@example.com> -Date: Mon Jun 26 00:04:00 2006 +0000 - - Merge branch 'side' - -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 -$ |