From 62328d851988f2a1bef980749ef1d64b96136c9f Mon Sep 17 00:00:00 2001
From: Anton Hansson <hansson@google.com>
Date: Tue, 23 Feb 2021 15:07:02 +0000
Subject: [PATCH] Disallow use of error-prone merge-strategies

Test: No
Change-Id: I6b573c4bfeddfe14ef035e63238747577450a78c
---
 PREUPLOAD.cfg | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 PREUPLOAD.cfg

diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
new file mode 100644
index 0000000000..ce7515044e
--- /dev/null
+++ 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}