Merge remote branch 'ko/master' into jc/read-tree-cache-tree-fix

diff --git a/t/t5100/info0014 b/t/t5100/info0014
index ab9c8d09059417b7fab87af0dfee2cd20212d8d9..08566b34b978d090c710ce54357b2457590a55dc 100644 (file)
--- a/t/t5100/info0014
+++ b/t/t5100/info0014
@@ -1,5 +1,5 @@
-Author: Junio C Hamano
-Email: gitster@pobox.com
-Subject: Teach mailinfo to ignore everything before -- >8 -- mark
+Author: Junio Hamano
+Email: junkio@cox.net
+Subject: BLAH ONE
 Date: Thu, 20 Aug 2009 17:18:22 -0700