diff options
Diffstat (limited to 't/t6024-recursive-merge.sh')
| -rw-r--r-- | t/t6024-recursive-merge.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/t/t6024-recursive-merge.sh b/t/t6024-recursive-merge.sh index 31b96257b4..a398556137 100644 --- a/t/t6024-recursive-merge.sh +++ b/t/t6024-recursive-merge.sh @@ -70,7 +70,7 @@ G >>>>>>> G:a1 EOF -test_expect_success "result contains a conflict" "diff -u expect a1" +test_expect_success "result contains a conflict" "git diff expect a1" git ls-files --stage > out cat > expect << EOF @@ -79,6 +79,6 @@ cat > expect << EOF 100644 fd7923529855d0b274795ae3349c5e0438333979 3 a1 EOF -test_expect_success "virtual trees were processed" "diff -u expect out" +test_expect_success "virtual trees were processed" "git diff expect out" test_done |