diff options
Diffstat (limited to 'third_party/git/t/t4013/diff.diff_master_master^_side')
| -rw-r--r-- | third_party/git/t/t4013/diff.diff_master_master^_side | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/third_party/git/t/t4013/diff.diff_master_master^_side b/third_party/git/t/t4013/diff.diff_master_master^_side new file mode 100644 index 000000000000..50ec9cadd618 --- /dev/null +++ b/third_party/git/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 +$ |