diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-10-04 03:23:15 +0300 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-04 03:28:00 +0300 |
| commit | a7a5590c6ecd75157c24f6dac1624b0e70afeb23 (patch) | |
| tree | 2057bff51d3037f94eaef56c7e4dae9b52361a47 /t/t4214-log-graph-octopus.sh | |
| parent | 94ba151300ca5e4345a11b00244eb3501bc569f8 (diff) | |
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>
Diffstat (limited to 't/t4214-log-graph-octopus.sh')
| -rwxr-xr-x | t/t4214-log-graph-octopus.sh | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/t/t4214-log-graph-octopus.sh b/t/t4214-log-graph-octopus.sh index dab96c89aa..f6e22ec825 100755 --- a/t/t4214-log-graph-octopus.sh +++ b/t/t4214-log-graph-octopus.sh @@ -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 ' |