t/t4013/diff.whatchanged_--root_--cc_--patch-with-stat_--summary_master

   1 $ git whatchanged --root --cc --patch-with-stat --summary master
   2 commit 176b998f5d647cbd77a9d8acf4531e930754d16d
   3 Merge: 889b315... c7a2ab9...
   4 Author: A U Thor <author@example.com>
   5 Date:   Mon Jun 26 00:04:00 2006 +0000
   6
   7     Merge branch 'side'
   8 ---
   9  dir/sub |    2 ++
  10  file0   |    3 +++
  11  2 files changed, 5 insertions(+), 0 deletions(-)
  12
  13
  14 diff --cc dir/sub
  15 index cead32e,7289e35..992913c
  16 --- a/dir/sub
  17 +++ b/dir/sub
  18 @@@ -1,6 -1,4 +1,8 @@@
  19   A
  20   B
  21  +C
  22  +D
  23  +E
  24  +F
  25 + 1
  26 + 2
  27 diff --cc file0
  28 index b414108,f4615da..10a8a9f
  29 --- a/file0
  30 +++ b/file0
  31 @@@ -1,6 -1,6 +1,9 @@@
  32   1
  33   2
  34   3
  35  +4
  36  +5
  37  +6
  38 + A
  39 + B
  40 + C
  41
  42 commit c7a2ab9e8eac7b117442a607d5a9b3950ae34d5a
  43 Author: A U Thor <author@example.com>
  44 Date:   Mon Jun 26 00:03:00 2006 +0000
  45
  46     Side
  47 ---
  48  dir/sub |    2 ++
  49  file0   |    3 +++
  50  file3   |    4 ++++
  51  3 files changed, 9 insertions(+), 0 deletions(-)
  52  create mode 100644 file3
  53
  54 diff --git a/dir/sub b/dir/sub
  55 index 35d242b..7289e35 100644
  56 --- a/dir/sub
  57 +++ b/dir/sub
  58 @@ -1,2 +1,4 @@
  59  A
  60  B
  61 +1
  62 +2
  63 diff --git a/file0 b/file0
  64 index 01e79c3..f4615da 100644
  65 --- a/file0
  66 +++ b/file0
  67 @@ -1,3 +1,6 @@
  68  1
  69  2
  70  3
  71 +A
  72 +B
  73 +C
  74 diff --git a/file3 b/file3
  75 new file mode 100644
  76 index 0000000..7289e35
  77 --- /dev/null
  78 +++ b/file3
  79 @@ -0,0 +1,4 @@
  80 +A
  81 +B
  82 +1
  83 +2
  84
  85 commit 889b315013ef9f2e2f90aa0b054b267c8a557847
  86 Author: A U Thor <author@example.com>
  87 Date:   Mon Jun 26 00:02:00 2006 +0000
  88
  89     Third
  90 ---
  91  dir/sub |    2 ++
  92  file1   |    3 +++
  93  2 files changed, 5 insertions(+), 0 deletions(-)
  94  create mode 100644 file1
  95
  96 diff --git a/dir/sub b/dir/sub
  97 index 8422d40..cead32e 100644
  98 --- a/dir/sub
  99 +++ b/dir/sub
 100 @@ -2,3 +2,5 @@ A
 101  B
 102  C
 103  D
 104 +E
 105 +F
 106 diff --git a/file1 b/file1
 107 new file mode 100644
 108 index 0000000..b1e6722
 109 --- /dev/null
 110 +++ b/file1
 111 @@ -0,0 +1,3 @@
 112 +A
 113 +B
 114 +C
 115
 116 commit 7952a93e09bf565b5592766a438b40cd81f4846f
 117 Author: A U Thor <author@example.com>
 118 Date:   Mon Jun 26 00:01:00 2006 +0000
 119
 120     Second
 121 ---
 122  dir/sub |    2 ++
 123  file0   |    3 +++
 124  file2   |    3 ---
 125  3 files changed, 5 insertions(+), 3 deletions(-)
 126  delete mode 100644 file2
 127
 128 diff --git a/dir/sub b/dir/sub
 129 index 35d242b..8422d40 100644
 130 --- a/dir/sub
 131 +++ b/dir/sub
 132 @@ -1,2 +1,4 @@
 133  A
 134  B
 135 +C
 136 +D
 137 diff --git a/file0 b/file0
 138 index 01e79c3..b414108 100644
 139 --- a/file0
 140 +++ b/file0
 141 @@ -1,3 +1,6 @@
 142  1
 143  2
 144  3
 145 +4
 146 +5
 147 +6
 148 diff --git a/file2 b/file2
 149 deleted file mode 100644
 150 index 01e79c3..0000000
 151 --- a/file2
 152 +++ /dev/null
 153 @@ -1,3 +0,0 @@
 154 -1
 155 -2
 156 -3
 157
 158 commit 444ac553ac7612cc88969031b02b3767fb8a353a
 159 Author: A U Thor <author@example.com>
 160 Date:   Mon Jun 26 00:00:00 2006 +0000
 161
 162     Initial
 163 ---
 164  dir/sub |    2 ++
 165  file0   |    3 +++
 166  file2   |    3 +++
 167  3 files changed, 8 insertions(+), 0 deletions(-)
 168  create mode 100644 dir/sub
 169  create mode 100644 file0
 170  create mode 100644 file2
 171
 172 diff --git a/dir/sub b/dir/sub
 173 new file mode 100644
 174 index 0000000..35d242b
 175 --- /dev/null
 176 +++ b/dir/sub
 177 @@ -0,0 +1,2 @@
 178 +A
 179 +B
 180 diff --git a/file0 b/file0
 181 new file mode 100644
 182 index 0000000..01e79c3
 183 --- /dev/null
 184 +++ b/file0
 185 @@ -0,0 +1,3 @@
 186 +1
 187 +2
 188 +3
 189 diff --git a/file2 b/file2
 190 new file mode 100644
 191 index 0000000..01e79c3
 192 --- /dev/null
 193 +++ b/file2
 194 @@ -0,0 +1,3 @@
 195 +1
 196 +2
 197 +3
 198 $