Merge branch 'jc/maint-1.6.0-diff-borrow-carefully' into maint-1.6.1

diff --git a/t/t5100/sample.mbox b/t/t5100/sample.mbox
index 94da4daa1a12a19f0a850ce845042c5ce953646b..85df55f2c43c9462f7bf36f0b3acf186b84d64b0 100644 (file)
--- a/t/t5100/sample.mbox
+++ b/t/t5100/sample.mbox
@@ -2,7 +2,10 @@
        
     
 From nobody Mon Sep 17 00:00:00 2001
-From: A U Thor <a.u.thor@example.com>
+From: A
+      U
+      Thor
+      <a.u.thor@example.com>
 Date: Fri, 9 Jun 2006 00:44:16 -0700
 Subject: [PATCH] a commit.
 
@@ -553,3 +556,8 @@ index 3fd3afb..0ee807e 100644
  #. на своей машине: отредактировать /etc/sudoers (команда ``visudo``) примерно следующим образом::
 -- 
 1.5.6.5
+From nobody Mon Sep 17 00:00:00 2001
+From: <a.u.thor@example.com> (A U Thor)
+Date: Fri, 9 Jun 2006 00:44:16 -0700
+Subject: [PATCH] a patch
+