My Various Git Projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 94ba151) | patch
t4214: use test_merge
authorDenton Liu <liu.denton@gmail.com>
Fri, 4 Oct 2019 00:23:15 +0000 (17:23 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 4 Oct 2019 00:28:00 +0000 (09:28 +0900)
commita7a5590c6ecd75157c24f6dac1624b0e70afeb23
tree2057bff51d3037f94eaef56c7e4dae9b52361a47tree | snapshot
parent94ba151300ca5e4345a11b00244eb3501bc569f8commit | 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>
t/t4214-log-graph-octopus.sh diff | blob | history
The core git plumbing