From d5a396de8137e19fd1223ff2db60880740b0dd5a Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: Oct 26 2017 09:10:15 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/vim-update.sh b/vim-update.sh
index 403a6bc..6cece6a 100755
--- a/vim-update.sh
+++ b/vim-update.sh
@@ -148,6 +148,7 @@ if [ $CHANGES -ne 0 ]; then
      fi
 
      # Increment index and cut the head of releases_regexp string
+     let "branches_index+=1"
      let "release_index+=1"
      releases_regexp=${releases_regexp#*|}
    done
diff --git a/vim.spec b/vim.spec
index 4e7f225..e7f97cb 100644
--- a/vim.spec
+++ b/vim.spec
@@ -775,7 +775,6 @@ rm -rf %{buildroot}
 %changelog
 * Thu Oct 26 2017 Zdenek Dohnal <zdohnal@redhat.com> - 8.0.1216-2
 - mention GVim in Summary and Description of vim-x11 subpackage
-- update vim-update.sh to merge with the oldest branch
 
 * Wed Oct 25 2017 Karsten Hopp <karsten@redhat.com> 8.0.1216-1
 - patchlevel 1216