Merge branch 'cr/tag'

diff --git a/t/lib-read-tree-m-3way.sh b/t/lib-read-tree-m-3way.sh
old mode 100755 (executable)
new mode 100644 (file)
index d195603..586df21
--- a/t/lib-read-tree-m-3way.sh
+++ b/t/lib-read-tree-m-3way.sh
@@ -87,7 +87,7 @@ test_expect_success \
 test_expect_success \
     'recording branch A tree' \
     'tree_A=$(git-write-tree)'
-          
+
 ################################################################
 # Branch B
 # Start from O