Merge branch 'js/config-rename'

diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh
index 4f664f6adfb6153058848d3a3016c34e08b9425c..c11420a8b6ce9104f1c2ca3b4b2a23aef4f265ff 100755 (executable)
--- a/t/t1004-read-tree-m-u-wf.sh
+++ b/t/t1004-read-tree-m-u-wf.sh
@@ -87,7 +87,7 @@ test_expect_success 'three-way not complaining on an untracked path in both' '
        git-read-tree -m -u branch-point master side
 '
 
-test_expect_success 'three-way not cloberring a working tree file' '
+test_expect_success 'three-way not clobbering a working tree file' '
 
        git reset --hard &&
        rm -f file2 subdir/file2 file3 subdir/file3 &&