]>
git.ipfire.org Git - thirdparty/git.git/blob - t/t6045-merge-rename-delete.sh
3 test_description
='Merge-recursive rename/delete conflict message'
6 test_expect_success
'rename/delete' '
9 git commit -m "initial" &&
11 git checkout -b rename &&
13 git commit -m "rename" &&
15 git checkout master &&
17 git commit -m "delete" &&
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