Skip to main content

Browse the archive

Staging
v0.5.1
Revision 297ca895a27a6bbdb7906371d533f72a12ad25b2 authored by Junio C Hamano on 20 January 2022, 23:25:38 UTC, committed by Junio C Hamano on 20 January 2022, 23:25:38 UTC 
Merge branch 'js/branch-track-inherit'
 
"git branch -h" incorrectly said "--track[=direct|inherit]",
implying that "--trackinherit" is a valid option, which has been
corrected.
source: <3de40324bea6a1dd9bca2654721471e3809e87d8.1642538935.git.steadmon@google.com>
source: <c3c26192-aee9-185a-e559-b8735139e49c@web.de>

* js/branch-track-inherit:
  branch,checkout: fix --track documentation
2 parent s 50b2d72 + 6327f0e
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