Merge branch 'rs/diff-parseopts-cleanup'
[git/gitster.git] / t / lib-merge.sh
blob8734ebfc17f37fca87ac96e227463266d69c8755
1 # Helper functions used by merge tests.
3 test_expect_merge_algorithm () {
4 status_for_recursive=$1 status_for_ort=$2
5 shift 2
7 if test "$GIT_TEST_MERGE_ALGORITHM" = ort
8 then
9 test_expect_${status_for_ort} "$@"
10 else
11 test_expect_${status_for_recursive} "$@"