diff options
Diffstat (limited to 'third_party/git/t/t6425-merge-rename-delete.sh')
| -rwxr-xr-x | third_party/git/t/t6425-merge-rename-delete.sh | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/third_party/git/t/t6425-merge-rename-delete.sh b/third_party/git/t/t6425-merge-rename-delete.sh deleted file mode 100755 index f79d02159021..000000000000 --- a/third_party/git/t/t6425-merge-rename-delete.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -test_description='Merge-recursive rename/delete conflict message' -. ./test-lib.sh - -test_expect_success 'rename/delete' ' - echo foo >A && - git add A && - git commit -m "initial" && - - git checkout -b rename && - git mv A B && - git commit -m "rename" && - - git checkout master && - git rm A && - git commit -m "delete" && - - test_must_fail git merge --strategy=recursive rename >output && - test_i18ngrep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output && - test_i18ngrep "CONFLICT (rename/delete): A.*deleted in HEAD." output -' - -test_done |