X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft1004-read-tree-m-u-wf.sh;h=d609a551ae3b8c75714f6cf4e9cefe4f6af61c5b;hb=54e1abce90ed44d0674772a735ac387ce3e264f2;hp=c11420a8b6ce9104f1c2ca3b4b2a23aef4f265ff;hpb=b4d2b04c9b6dc42c0bcf0513b9d8f731ec26db82;p=git.git diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh index c11420a8b..d609a551a 100755 --- 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' '