Commit 62328d85 authored Feb 23, 2021 by Anton Hansson

Disallow use of error-prone merge-strategies

Test: No
Change-Id: I6b573c4bfeddfe14ef035e63238747577450a78c

parent d6a7f164

PREUPLOAD.cfg

0 → 100644

+2 −0

Original line number	Diff line number	Diff line
		[Hook Scripts]
		do_not_use_DO_NOT_MERGE = ${REPO_ROOT}/build/soong/scripts/check_do_not_merge.sh ${PREUPLOAD_COMMIT}