[tor-commits] [gettor/master] Update update_files

[hiro at torproject.org]

commit 32d648ab63a8a264575b3d170b6f00e4b4985e71
Author: hiro <hiro at torproject.org>
Date:   Sat Aug 31 11:51:53 2019 +0200

    Update update_files
---
 scripts/update_files | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/update_files b/scripts/update_files
index 44584c7..681bf86 100644
--- a/scripts/update_files
+++ b/scripts/update_files
@@ -34,6 +34,7 @@ for row in $(
           git push -f --follow-tags origin releases
       fi
       git checkout -b torbrowser-releases
+      git merge releases
       diffs=$(git diff github/torbrowser-releases)
       if [ -z "$diffs" ]; then
           echo "No new releases"