X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=t%2Ft6024-recursive-merge.sh;h=755d30ce2a5d1c5e34751d8906ad41b02d553b03;hb=d3cae60efcf28e3d498423b9d11dd772d424ddc9;hp=b3fbf659c003acbed785558c21950046b8caced8;hpb=7e00a9104bc8ce27f73132fbaa8f8528e26206a8;p=git.git diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh index b3fbf659c..755d30ce2 100755 --- a/t/t6024-recursive-merge.sh +++ b/t/t6024-recursive-merge.sh @@ -104,7 +104,7 @@ test_expect_success 'mark rename/delete as unmerged' ' test_tick && git commit -m delete && git checkout -b rename HEAD^ && - git mv a1 a2 + git mv a1 a2 && test_tick && git commit -m rename && test_must_fail git merge delete &&