diff options
author | Jiang Xin <worldhello.net@gmail.com> | 2019-05-31 14:34:26 +0800 |
---|---|---|
committer | Jiang Xin <worldhello.net@gmail.com> | 2019-05-31 14:34:26 +0800 |
commit | a17177ce3ac74afc0b2e6fc6c80c1e1991b96a13 (patch) | |
tree | 0ff1a62d28a13bc8d8708148b85d3b0ba2632f92 /t/t4013/diff.diff_-U2_initial..side | |
parent | Merge branch 'master' of https://github.com/Softcatala/git-po (diff) | |
parent | Git 2.22-rc2 (diff) | |
download | tgif-a17177ce3ac74afc0b2e6fc6c80c1e1991b96a13.tar.xz |
Merge branch 'master' of git://git.kernel.org/pub/scm/git/git
* 'master' of git://git.kernel.org/pub/scm/git/git: (66 commits)
Git 2.22-rc2
...
Diffstat (limited to 't/t4013/diff.diff_-U2_initial..side')
-rw-r--r-- | t/t4013/diff.diff_-U2_initial..side | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/t/t4013/diff.diff_-U2_initial..side b/t/t4013/diff.diff_-U2_initial..side new file mode 100644 index 0000000000..8ffe04f203 --- /dev/null +++ b/t/t4013/diff.diff_-U2_initial..side @@ -0,0 +1,31 @@ +$ git diff -U2 initial..side +diff --git a/dir/sub b/dir/sub +index 35d242b..7289e35 100644 +--- a/dir/sub ++++ b/dir/sub +@@ -1,2 +1,4 @@ + A + B ++1 ++2 +diff --git a/file0 b/file0 +index 01e79c3..f4615da 100644 +--- a/file0 ++++ b/file0 +@@ -2,2 +2,5 @@ + 2 + 3 ++A ++B ++C +diff --git a/file3 b/file3 +new file mode 100644 +index 0000000..7289e35 +--- /dev/null ++++ b/file3 +@@ -0,0 +1,4 @@ ++A ++B ++1 ++2 +$ |