Merge branch 'mr/compat-snprintf'

diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh
index c11420a8b6ce9104f1c2ca3b4b2a23aef4f265ff..d609a551ae3b8c75714f6cf4e9cefe4f6af61c5b 100755 (executable)
--- a/t/t1004-read-tree-m-u-wf.sh
+++ b/t/t1004-read-tree-m-u-wf.sh
@@ -84,7 +84,7 @@ test_expect_success 'three-way not complaining on an untracked path in both' '
        echo >file2 file two is untracked on the master side &&
        echo >subdir/file2 file two is untracked on the master side &&
 
-       git-read-tree -m -u branch-point master side
+       git read-tree -m -u branch-point master side
 '
 
 test_expect_success 'three-way not clobbering a working tree file' '