]> git.ipfire.org Git - thirdparty/git.git/commit - t/test-lib-functions.sh
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5fa0f52) | patch
test-lib: let test_merge() perform octopus merges
authorDenton Liu <liu.denton@gmail.com>
Fri, 4 Oct 2019 00:23:13 +0000 (17:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Oct 2019 00:28:00 +0000 (09:28 +0900)
commit94ba151300ca5e4345a11b00244eb3501bc569f8
treee0927e0a3dba8e01900d4edf6c7061086c17f9c0tree | snapshot
parent5fa0f5238b0cd46cfe7f6fa76c3f526ea98148d9commit | diff
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>
t/test-lib-functions.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.