X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=t%2Ft7060-wtstatus.sh;h=fcac4725982096af98414c5d40df2d4c14be9454;hb=48c250a121a425a1860226b6a7061aecfbab5246;hp=0919ec46f67d47f536c2fe68c783e02aeb384c86;hpb=dd20f8af1ae54773569b78b1b71d1ea663705d2c;p=git.git diff --git a/t/t7060-wtstatus.sh b/t/t7060-wtstatus.sh index 0919ec46f..fcac47259 100755 --- a/t/t7060-wtstatus.sh +++ b/t/t7060-wtstatus.sh @@ -31,7 +31,6 @@ test_expect_success 'Report new path with conflict' ' cat >expect <..." to unstage) # (use "git add/rm ..." as appropriate to mark resolution) # # deleted by us: foo