diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-10-03 17:23:13 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-04 09:28:00 +0900 |
| commit | 94ba151300ca5e4345a11b00244eb3501bc569f8 (patch) | |
| tree | e0927e0a3dba8e01900d4edf6c7061086c17f9c0 /t/t4214-log-graph-octopus.sh | |
| parent | 5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9 (diff) | |
| download | git-94ba151300ca5e4345a11b00244eb3501bc569f8.tar.gz | |
test-lib: let test_merge() perform octopus merges
Currently test_merge() only allows developers to merge in one branch.
However, this restriction is artificial and there is no reason why it
needs to be this way.
Extend test_merge() to allow the specification of multiple branches so
that octopus merges can be performed.
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')
0 files changed, 0 insertions, 0 deletions