Merge branch 'js/commit-graph-warning'
[git] / t / t6425-merge-rename-delete.sh
1 #!/bin/sh
2
3 test_description='Merge-recursive rename/delete conflict message'
4 GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME=main
5 export GIT_TEST_DEFAULT_INITIAL_BRANCH_NAME
6
7 . ./test-lib.sh
8
9 test_expect_success 'rename/delete' '
10         echo foo >A &&
11         git add A &&
12         git commit -m "initial" &&
13
14         git checkout -b rename &&
15         git mv A B &&
16         git commit -m "rename" &&
17
18         git checkout main &&
19         git rm A &&
20         git commit -m "delete" &&
21
22         test_must_fail git merge --strategy=recursive rename >output &&
23         test_i18ngrep "CONFLICT (rename/delete): A.* renamed .*to B.* in rename" output &&
24         test_i18ngrep "CONFLICT (rename/delete): A.*deleted in HEAD." output
25 '
26
27 test_done