Disallow use of error-prone merge-strategies

Anton Hansson · Anton Hansson · commit 62328d851988 · 2021-02-23T15:07:02.000Z
Test: No
Change-Id: I6b573c4bfeddfe14ef035e63238747577450a78c
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
@@ -0,0 +1,2 @@
+[Hook Scripts]
+do_not_use_DO_NOT_MERGE = ${REPO_ROOT}/build/soong/scripts/check_do_not_merge.sh ${PREUPLOAD_COMMIT}

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+[Hook Scripts]`
	`2`	`+do_not_use_DO_NOT_MERGE = ${REPO_ROOT}/build/soong/scripts/check_do_not_merge.sh ${PREUPLOAD_COMMIT}`