diff options
| author | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-27 17:19:40 +0000 |
|---|---|---|
| committer | Jonathan Maw <jonathan.maw@codethink.co.uk> | 2013-09-27 17:19:40 +0000 |
| commit | 7bf8e474d15414eda8520ba5258511d845ca6061 (patch) | |
| tree | 417d6cfc8946fce8e2f87fdf3ec964036abd495c /t/t4013/diff.format-patch_--stdout_initial..master^ | |
| parent | 45d74c4b0fe38218b4569a90da7102cf48d616c2 (diff) | |
| parent | e230c568c4b9a991e3175e5f65171a566fd8e39c (diff) | |
| download | git-7bf8e474d15414eda8520ba5258511d845ca6061.tar.gz | |
Merge tag 'v1.8.4' into baserock/morph
Git 1.8.4
Diffstat (limited to 't/t4013/diff.format-patch_--stdout_initial..master^')
| -rw-r--r-- | t/t4013/diff.format-patch_--stdout_initial..master^ | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/t/t4013/diff.format-patch_--stdout_initial..master^ b/t/t4013/diff.format-patch_--stdout_initial..master^ index b7f9725dc4..2ae454d807 100644 --- a/t/t4013/diff.format-patch_--stdout_initial..master^ +++ b/t/t4013/diff.format-patch_--stdout_initial..master^ @@ -6,9 +6,9 @@ Subject: [PATCH 1/2] Second This is the second commit. --- - dir/sub | 2 ++ - file0 | 3 +++ - file2 | 3 --- + dir/sub | 2 ++ + file0 | 3 +++ + file2 | 3 --- 3 files changed, 5 insertions(+), 3 deletions(-) delete mode 100644 file2 @@ -51,9 +51,9 @@ Date: Mon, 26 Jun 2006 00:02:00 +0000 Subject: [PATCH 2/2] Third --- - dir/sub | 2 ++ - file1 | 3 +++ - 2 files changed, 5 insertions(+), 0 deletions(-) + dir/sub | 2 ++ + file1 | 3 +++ + 2 files changed, 5 insertions(+) create mode 100644 file1 diff --git a/dir/sub b/dir/sub |