File: lib-merge.sh

package info (click to toggle)
git 1%3A2.47.3-0%2Bdeb13u1
  • links: PTS, VCS
  • area: main
  • in suites: trixie
  • size: 59,700 kB
  • sloc: ansic: 298,483; sh: 255,583; perl: 29,458; tcl: 22,173; makefile: 4,235; python: 3,442; javascript: 772; awk: 47; csh: 45; ruby: 43; lisp: 12
file content (13 lines) | stat: -rw-r--r-- 268 bytes parent folder | download | duplicates (6) 
1
2
3
4
5
6
7
8
9
10
11
12
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
}