blob: 53d83c828a7540a322a8fe8879f07228220f486c (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
|
#!/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"
test_submodule_switch "merge --no-ff"
test_done
|
