From 37de3202fc1f09fc55e612af0a5deadb187f8ba0 Mon Sep 17 00:00:00 2001
From: Daniel Norman <danielnorman@google.com>
Date: Thu, 19 Nov 2020 14:47:18 -0800
Subject: [PATCH] Makes aosp_redfin_vf merge script fail on errors.

Test: merge.sh with a failing merge, observe non-zero result.
Change-Id: I47a5de9787531d9f4c812ceb77929489a7661fdf
---
 vf/merge.sh | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/vf/merge.sh b/vf/merge.sh
index d2588a5..ac2c82d 100755
--- a/vf/merge.sh
+++ b/vf/merge.sh
@@ -3,6 +3,8 @@
 # Thin wrapper around merge_target_files to allow flag changes to be made in a
 # presubmit-guarded change.
 
+set -e
+
 readonly DIST_DIR=$1
 readonly VENDOR_DIR=$2