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

Test: No
Change-Id: I2ed682c013e9bf0bfe43270382fcb8f9cec24e10
---
 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 0000000..ce75150
--- /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}