X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft1004-read-tree-m-u-wf.sh;h=c11420a8b6ce9104f1c2ca3b4b2a23aef4f265ff;hb=d77ee72662a821d66ae218056f0103eb24d8d4b4;hp=4f664f6adfb6153058848d3a3016c34e08b9425c;hpb=f388cec3d77751a6c20b3b10415344f5355b5a2f;p=git.git diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh index 4f664f6ad..c11420a8b 100755 --- 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 &&