3 test_description
='subtree merge strategy'
7 test_expect_success setup
'
10 for i in $s; do echo $i; done >hello &&
12 git commit -m initial &&
13 git checkout -b side &&
16 git commit -m second &&
17 git checkout master &&
18 for i in mundo $s; do echo $i; done >hello &&
24 test_expect_success
'subtree available and works like recursive' '
26 git merge -s subtree side &&
27 for i in mundo $s world; do echo $i; done >expect &&