index f3a4bb2ea231f66e26472aa00d2e769cb61350fa..01e5415e943f3e16154f2f4d999f85a9d8b6ae49 100755 (executable)
#!/bin/sh
-test_description='git-merge
+test_description='git merge
Testing octopus merge with more than 25 refs.'
done
'
-test_expect_failure 'merge c1 with c2, c3, c4, ... c29' '
+test_expect_success 'merge c1 with c2, c3, c4, ... c29' '
git reset --hard c1 &&
i=2 &&
refs="" &&