diff options
Diffstat (limited to '')
| -rwxr-xr-x | third_party/git/t/t6439-merge-co-error-msgs.sh (renamed from third_party/git/t/t7609-merge-co-error-msgs.sh) | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/third_party/git/t/t7609-merge-co-error-msgs.sh b/third_party/git/t/t6439-merge-co-error-msgs.sh index e90413204e..5c8894d94f 100755 --- a/third_party/git/t/t7609-merge-co-error-msgs.sh +++ b/third_party/git/t/t6439-merge-co-error-msgs.sh @@ -126,7 +126,7 @@ test_expect_success 'not_uptodate_dir porcelain checkout error' ' git rm rep2 -r && >rep && >rep2 && - git add rep rep2&& + git add rep rep2 && git commit -m "added test as a file" && git checkout master && >rep/untracked-file && |