repo.or.cz
/
git
/
gitster.git
/
blob
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
log
|
graphiclog1
|
graphiclog2
|
commit
|
commitdiff
|
tree
|
refs
|
edit
|
fork
blame
|
history
|
raw
|
HEAD
Merge branch 'rs/diff-parseopts-cleanup'
[git/gitster.git]
/
t
/
lib-merge.sh
blob
8734ebfc17f37fca87ac96e227463266d69c8755
1
# Helper functions used by merge tests.
2
3
test_expect_merge_algorithm
() {
4
status_for_recursive
=
$1
status_for_ort
=
$2
5
shift
2
6
7
if
test
"
$GIT_TEST_MERGE_ALGORITHM
"
=
ort
8
then
9
test_expect_
${status_for_ort}
"$@"
10
else
11
test_expect_
${status_for_recursive}
"$@"
12
fi
13
}