1 files changed, 19 insertions, 0 deletions
diff --git a/third_party/git/t/t6438-submodule-directory-file-conflicts.sh b/third_party/git/t/t6438-submodule-directory-file-conflicts.sh
new file mode 100755
index 000000000000..04bf4be7d792
--- /dev/null
+++ b/third_party/git/t/t6438-submodule-directory-file-conflicts.sh
@@ -0,0 +1,19 @@
+#!/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