From 4209b5891aa4e0561bcce36d2c46737ec63776a9 Mon Sep 17 00:00:00 2001
From: Zdenek Dohnal <zdohnal@redhat.com>
Date: May 17 2017 07:47:18 +0000
Subject: Merge branch 'f25' into f26


---

diff --git a/.gitignore b/.gitignore
index a30789d..4617085 100644
--- a/.gitignore
+++ b/.gitignore
@@ -68,3 +68,4 @@
 /vim-8.0-596.tar.bz2
 /vim-8.0-597.tar.bz2
 /vim-8.0-598.tar.bz2
+/vim-8.0-599.tar.bz2
diff --git a/README.patches b/README.patches
index 38c7ce0..2740865 100644
--- a/README.patches
+++ b/README.patches
@@ -1,3 +1,12 @@
+commit 79a213d6a4e909703524a7f1ad985c7bd40650a6
+Author: Bram Moolenaar <Bram@vim.org>
+Date:   Tue May 16 13:15:18 2017 +0200
+
+    patch 8.0.0599: diff mode is insufficiently tested
+    
+    Problem:    diff mode is insufficiently tested
+    Solution:   Add more test cases. (Dominique Pelle, closes #1685)
+
 commit 9e0f6ec0762575d229b86798b284ca4876bc3d73
 Author: Bram Moolenaar <Bram@vim.org>
 Date:   Tue May 16 09:36:54 2017 +0200
diff --git a/sources b/sources
index 755314d..ec790cc 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (vim-8.0-598.tar.bz2) = 594b82fc59f6da9b6eedcf9417c88d8420e0ed31fc6cfa92ccb62efe6303ee898cacf86bd42aebd1e4ea89bba8e67bd2128871703ccd71954e9b20ea63f0c326
+SHA512 (vim-8.0-599.tar.bz2) = 763235b9a59bc6695a168fc5bf78cb1370a0cb52973ba2fbcb76eac352e86629d83a7592c18000917de1b3850db0719005110c6458c1591ede1327d06a07d8df
diff --git a/vim.spec b/vim.spec
index f9e572b..0dde155 100644
--- a/vim.spec
+++ b/vim.spec
@@ -1,4 +1,4 @@
-%define patchlevel 598
+%define patchlevel 599
 %if %{?WITH_SELINUX:0}%{!?WITH_SELINUX:1}
 %define WITH_SELINUX 1
 %endif
@@ -770,6 +770,9 @@ rm -rf %{buildroot}
 %{_datadir}/icons/locolor/*/apps/*
 
 %changelog
+* Wed May 17 2017 Karsten Hopp <karsten@redhat.com> 8.0.599-1
+- patchlevel 599
+
 * Tue May 16 2017 Karsten Hopp <karsten@redhat.com> 8.0.598-1
 - patchlevel 598