diff options
| author | Jiang Xin <worldhello.net@gmail.com> | 2012-02-28 12:23:26 +0800 |
|---|---|---|
| committer | Jiang Xin <worldhello.net@gmail.com> | 2012-02-28 12:23:26 +0800 |
| commit | 508d1244dc8d38188c70e98207efa8a97d16b47c (patch) | |
| tree | fc8688b80be453755f8135df11bf1db2d247725a /t/t4013/diff.format-patch_--stdout_initial..master^ | |
| parent | l10n: fast-forward here is ff-only merge, not push (diff) | |
| parent | Merge branch 'maint' (diff) | |
| download | git-508d1244dc8d38188c70e98207efa8a97d16b47c.tar.gz git-508d1244dc8d38188c70e98207efa8a97d16b47c.zip | |
Merge branch 'master' into git-po
Diffstat (limited to 't/t4013/diff.format-patch_--stdout_initial..master^')
| -rw-r--r-- | t/t4013/diff.format-patch_--stdout_initial..master^ | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/t/t4013/diff.format-patch_--stdout_initial..master^ b/t/t4013/diff.format-patch_--stdout_initial..master^ index b7f9725dc4..39f4a3f2d1 100644 --- a/t/t4013/diff.format-patch_--stdout_initial..master^ +++ b/t/t4013/diff.format-patch_--stdout_initial..master^ @@ -53,7 +53,7 @@ Subject: [PATCH 2/2] Third --- dir/sub | 2 ++ file1 | 3 +++ - 2 files changed, 5 insertions(+), 0 deletions(-) + 2 files changed, 5 insertions(+) create mode 100644 file1 diff --git a/dir/sub b/dir/sub |