t / t4013 / diff.diff-tree_-p_-m_masteron commit Merge branch 'cn/maint-branch-with-bad' (7d47367)
   1$ git diff-tree -p -m master
   259d314ad6f356dd08601a4cd5e530381da3e3c64
   3diff --git a/dir/sub b/dir/sub
   4index cead32e..992913c 100644
   5--- a/dir/sub
   6+++ b/dir/sub
   7@@ -4,3 +4,5 @@ C
   8 D
   9 E
  10 F
  11+1
  12+2
  13diff --git a/file0 b/file0
  14index b414108..10a8a9f 100644
  15--- a/file0
  16+++ b/file0
  17@@ -4,3 +4,6 @@
  18 4
  19 5
  20 6
  21+A
  22+B
  23+C
  2459d314ad6f356dd08601a4cd5e530381da3e3c64
  25diff --git a/dir/sub b/dir/sub
  26index 7289e35..992913c 100644
  27--- a/dir/sub
  28+++ b/dir/sub
  29@@ -1,4 +1,8 @@
  30 A
  31 B
  32+C
  33+D
  34+E
  35+F
  36 1
  37 2
  38diff --git a/file0 b/file0
  39index f4615da..10a8a9f 100644
  40--- a/file0
  41+++ b/file0
  42@@ -1,6 +1,9 @@
  43 1
  44 2
  45 3
  46+4
  47+5
  48+6
  49 A
  50 B
  51 C
  52diff --git a/file1 b/file1
  53new file mode 100644
  54index 0000000..b1e6722
  55--- /dev/null
  56+++ b/file1
  57@@ -0,0 +1,3 @@
  58+A
  59+B
  60+C
  61diff --git a/file2 b/file2
  62deleted file mode 100644
  63index 01e79c3..0000000
  64--- a/file2
  65+++ /dev/null
  66@@ -1,3 +0,0 @@
  67-1
  68-2
  69-3
  70diff --git a/file3 b/file3
  71deleted file mode 100644
  72index 7289e35..0000000
  73--- a/file3
  74+++ /dev/null
  75@@ -1,4 +0,0 @@
  76-A
  77-B
  78-1
  79-2
  80$