| 1 | #!/bin/sh |
| 2 | |
| 3 | test_description='merge can handle submodules' |
| 4 | |
| 5 | . ./test-lib.sh |
| 6 | . "$TEST_DIRECTORY"/lib-submodule-update.sh |
| 7 | |
| 8 | # merges without conflicts |
| 9 | test_submodule_switch "merge" |
| 10 | |
| 11 | test_submodule_switch "merge --ff" |
| 12 | |
| 13 | test_submodule_switch "merge --ff-only" |
| 14 | |
| 15 | test_submodule_switch "merge --no-ff" |
| 16 | |
| 17 | test_done |