Merge branch 'jc/checkout-from-tree-keep-local-changes' into maint

diff --git a/t/t4013/diff.log_-SF_master b/t/t4013/diff.log_-SF_master
index 6162ed2018cbf464790a2c5322422e5cce396d5d..c1599f2f520090b0717d951a69ade5a9960f8038 100644 (file)
--- a/t/t4013/diff.log_-SF_master
+++ b/t/t4013/diff.log_-SF_master
@@ -4,5 +4,4 @@ Author: A U Thor <author@example.com>
 Date:   Mon Jun 26 00:02:00 2006 +0000
 
     Third
-
 $