| commit | 68892c49dfb82f0ba58958cb75b6debeaaf69cf6 | [log] [tgz] |
|---|---|---|
| author | Anton Hansson <hansson@google.com> | Tue Feb 23 18:29:05 2021 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Feb 23 18:29:05 2021 +0000 |
| tree | 1e91e40926bd0dcfc192b905ef003a3ce6b39e2d | |
| parent | 157e6a06e412d144b8de9abf27aa00b5b6c91beb [diff] | |
| parent | 62328d851988f2a1bef980749ef1d64b96136c9f [diff] |
Merge "Disallow use of error-prone merge-strategies"
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}