Merge branch 'maint'

diff --git a/t/t4013/diff.whatchanged_--root_master b/t/t4013/diff.whatchanged_--root_master
index 011a22178f84bdfb5fa1f1fa580f73ee9834f451..a405cb6138857d3a1bc1b590aa55565c34770e4c 100644 (file)
--- a/t/t4013/diff.whatchanged_--root_master
+++ b/t/t4013/diff.whatchanged_--root_master
@@ -9,7 +9,7 @@ Date:   Mon Jun 26 00:03:00 2006 +0000
 :100644 100644 01e79c3... f4615da... M file0
 :000000 100644 0000000... 7289e35... A file3
 
-commit 889b315013ef9f2e2f90aa0b054b267c8a557847
+commit 9a6d4949b6b76956d9d5e26f2791ec2ceff5fdc0
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:02:00 2006 +0000
 
@@ -18,11 +18,13 @@ Date:   Mon Jun 26 00:02:00 2006 +0000
 :100644 100644 8422d40... cead32e... M dir/sub
 :000000 100644 0000000... b1e6722... A file1
 
-commit 7952a93e09bf565b5592766a438b40cd81f4846f
+commit 1bde4ae5f36c8d9abe3a0fce0c6aab3c4a12fe44
 Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:01:00 2006 +0000
 
     Second
+    
+    This is the second commit.
 
 :100644 100644 35d242b... 8422d40... M dir/sub
 :100644 100644 01e79c3... b414108... M file0