t4214: use test_merge
In the previous commit, we extended test_merge() so that it could perform octopus merges. Now that the restriction is lifted, use test_merge() to perform the octopus merge instead of manually duplicating test_merge() functionality. Signed-off-by: Denton Liu <liu.denton@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Denton Liu committed
Oct 3, 2019 at 17:23 UTC
a7a5590c6ecd75157c24f6dac1624b0e70afeb23
1 file changed
+1
-2
t/t4214-log-graph-octopus.sh
+1
-2
@@ -41,8 +41,7 @@ test_expect_success 'set up merge history' '
41
test_commit $i $i $i tag$i || return $?
42
done &&
43
git checkout 1 -b merge &&
44
- test_tick &&
45
- git merge -m octopus-merge 1 2 3 4 &&
44
+ test_merge octopus-merge 1 2 3 4 &&
45
git checkout 1 -b L &&
46
test_commit left
47
'