1#!/bin/sh23test_description='merge can handle submodules'45. ./test-lib.sh6. "$TEST_DIRECTORY"/lib-submodule-update.sh78# merges without conflicts9test_submodule_switch "git merge"1011test_submodule_switch "git merge --ff"1213test_submodule_switch "git merge --ff-only"1415KNOWN_FAILURE_NOFF_MERGE_DOESNT_CREATE_EMPTY_SUBMODULE_DIR=116KNOWN_FAILURE_NOFF_MERGE_ATTEMPTS_TO_MERGE_REMOVED_SUBMODULE_FILES=117test_submodule_switch "git merge --no-ff"1819test_done