X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft1000-read-tree-m-3way.sh;h=ca8a4098fa06afbdbe5c427983d3953550457bc2;hb=20db370b63a47b19e5f903b78af46ec8e709fa37;hp=4f171722d9e1dda7668f54b4104267eb70d91c67;hpb=4fd8145c0cb419a8b262115be8db9e18d63632db;p=git.git diff --git a/t/t1000-read-tree-m-3way.sh b/t/t1000-read-tree-m-3way.sh index 4f171722d..ca8a4098f 100755 --- a/t/t1000-read-tree-m-3way.sh +++ b/t/t1000-read-tree-m-3way.sh @@ -309,7 +309,7 @@ test_expect_success \ test_expect_success \ '6 - must not exist in O && !A && !B case' " rm -f .git/index DD && - echo DD >DD + echo DD >DD && git update-index --add DD && test_must_fail git read-tree -m $tree_O $tree_A $tree_B "