diff options
| author | Denton Liu <liu.denton@gmail.com> | 2019-10-03 17:23:15 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-10-04 09:28:00 +0900 |
| commit | a7a5590c6ecd75157c24f6dac1624b0e70afeb23 (patch) | |
| tree | 2057bff51d3037f94eaef56c7e4dae9b52361a47 /diff.c | |
| parent | test-lib: let test_merge() perform octopus merges (diff) | |
| download | git-a7a5590c6ecd75157c24f6dac1624b0e70afeb23.tar.gz git-a7a5590c6ecd75157c24f6dac1624b0e70afeb23.zip | |
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 'diff.c')
0 files changed, 0 insertions, 0 deletions