summaryrefslogtreecommitdiffstats
path: root/t/lib-merge.sh
diff options
context:
space:
mode:
Diffstat (limited to 't/lib-merge.sh')
-rw-r--r--t/lib-merge.sh13
1 files changed, 13 insertions, 0 deletions
diff --git a/t/lib-merge.sh b/t/lib-merge.sh
new file mode 100644
index 0000000..8734ebf
--- /dev/null
+++ b/t/lib-merge.sh
@@ -0,0 +1,13 @@
+# 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
+}