Collect merge-related tests to t64xx

[thirdparty/git.git] / t / t7613-merge-submodule.sh

diff --git a/t/t7613-merge-submodule.sh b/t/t7613-merge-submodule.sh
deleted file mode 100755 (executable)
index 04bf4be..0000000
--- a/t/t7613-merge-submodule.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/sh
-
-test_description='merge can handle submodules'
-
-. ./test-lib.sh
-. "$TEST_DIRECTORY"/lib-submodule-update.sh
-
-# merges without conflicts
-test_submodule_switch "merge"
-
-test_submodule_switch "merge --ff"
-
-test_submodule_switch "merge --ff-only"
-
-KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=1
-KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=1
-test_submodule_switch "merge --no-ff"
-
-test_done