Merge branch 'maint-1.6.0' into maint-1.6.1

[git.git] / t / t4013 / diff.format-patch_--attach_--stdout_initial..master^

diff --git a/t/t4013/diff.format-patch_--attach_--stdout_initial..master^ b/t/t4013/diff.format-patch_--attach_--stdout_initial..master^
index d7490a9fd729890c80a4b8fc3da0783997f81a04..2c71d20d376094fe1be51baa316fb080ad2155b4 100644 (file)
--- a/t/t4013/diff.format-patch_--attach_--stdout_initial..master^
+++ b/t/t4013/diff.format-patch_--attach_--stdout_initial..master^
@@ -2,7 +2,7 @@ $ git format-patch --attach --stdout initial..master^
 From 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44 Mon Sep 17 00:00:00 2001
 From: A U Thor <author@example.com>
 Date: Mon, 26 Jun 2006 00:01:00 +0000
-Subject: [PATCH] Second
+Subject: [PATCH 1/2] Second
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n"
 
@@ -63,7 +63,7 @@ index 01e79c3..0000000
 From 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0 Mon Sep 17 00:00:00 2001
 From: A U Thor <author@example.com>
 Date: Mon, 26 Jun 2006 00:02:00 +0000
-Subject: [PATCH] Third
+Subject: [PATCH 2/2] Third
 MIME-Version: 1.0
 Content-Type: multipart/mixed; boundary="------------g-i-t--v-e-r-s-i-o-n"