]> git.ipfire.org Git - thirdparty/git.git/blob - t/t6045-merge-rename-delete.sh
hashmap: use *_entry APIs for iteration
[thirdparty/git.git] / t / t6045-merge-rename-delete.sh
1 #!/bin/sh
2
3 test_description='Merge-recursive rename/delete conflict message'
4 . ./test-lib.sh
5
6 test_expect_success 'rename/delete' '
7 echo foo >A &&
8 git add A &&
9 git commit -m "initial" &&
10
11 git checkout -b rename &&
12 git mv A B &&
13 git commit -m "rename" &&
14
15 git checkout master &&
16 git rm A &&
17 git commit -m "delete" &&
18
19 test_must_fail git merge --strategy=recursive rename >output &&
20 test_i18ngrep "CONFLICT (rename/delete): A deleted in HEAD and renamed to B in rename. Version rename of B left in tree." output
21 '
22
23 test_done