Skip to main content

Browse the archive

Revision ec583449067bab5b800ecc63926f35c9dae96fa1 authored by Johannes Schindelin on 11 March 2023, 20:29:12 UTC, committed by Johannes Schindelin on 17 April 2023, 19:16:07 UTC 
Git 2.38.5
 
Signed-off-by: Taylor Blau <me@ttaylorr.com>
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
1 parent c96ecfe
Raw File
lib-merge.sh 
# Helper functions used by merge tests.

test_expect_merge_algorithm () {
	status_for_recursive=$1 status_for_ort=$2
	shift 2

	if test "$GIT_TEST_MERGE_ALGORITHM" = ort
	then
		test_expect_${status_for_ort} "$@"
	else
		test_expect_${status_for_recursive} "$@"
	fi
}
back to top