aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authoroni-link <knil.ino@gmail.com>2014-05-25 15:44:38 +0200
committerJustin M. Keyes <justinkz@gmail.com>2014-06-05 19:20:51 -0400
commit1e54b04bc0f68d65f8b751cb07aeb959258751f0 (patch)
treeb0fa6309547e5c83acadec468748cd67bed2d80b /src
parent2085acf478725cda653219d2898190df233a15b8 (diff)
downloadrneovim-1e54b04bc0f68d65f8b751cb07aeb959258751f0.tar.gz
rneovim-1e54b04bc0f68d65f8b751cb07aeb959258751f0.tar.bz2
rneovim-1e54b04bc0f68d65f8b751cb07aeb959258751f0.zip
Add more commented patch numbers to version.c (2) #763
This should help reduce conflicts when merging patches from upstream.
Diffstat (limited to 'src')
-rw-r--r--src/nvim/version.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 1f7754853d..84165f021a 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -202,6 +202,33 @@ static char *(features[]) = {
static int included_patches[] = {
// Add new patch number below this line
+ //316,
+ //315,
+ //314,
+ //313,
+ //312,
+ //311,
+ //310,
+ //309,
+ //308,
+ //307,
+ //306,
+ //305,
+ //304,
+ //303,
+ //302,
+ //301,
+ //300,
+ //299,
+ //298,
+ //297,
+ //296,
+ //295,
+ //294,
+ //293,
+ //292,
+ //291,
+ //290,
289,
288,
//287,