development/git
development/git
1
0
Fork 0
mirror of https://github.com/git/git synced 2024-09-12 21:04:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

t4214: use test_merge

Browse source 
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>
This commit is contained in:
Denton Liu 2019-10-03 17:23:15 -07:00 committed by Junio C Hamano
parent 94ba151300
commit a7a5590c6e
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
t/t4214-log-graph-octopus.sh
View file

@ -41,8 +41,7 @@ test_expect_success 'set up merge history' '
test_commit $i $i $i tag$i || return $?
done &&
git checkout 1 -b merge &&
test_tick &&
git merge -m octopus-merge 1 2 3 4 &&
test_merge octopus-merge 1 2 3 4 &&
git checkout 1 -b L &&
test_commit left
'