Collect merge-related tests to t64xx

[thirdparty/git.git] / t / t6045-merge-rename-delete.sh

diff --git a/t/t6045-merge-rename-delete.sh b/t/t6045-merge-rename-delete.sh
deleted file mode 100755 (executable)
index 5d33577..0000000
--- a/t/t6045-merge-rename-delete.sh
+++ /dev/null
@@ -1,23 +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 deleted in HEAD and renamed to B in rename. Version rename of B left in tree." output
-'
-
-test_done