From 510db303763739cbeb0500eb41b3551fd60a6cb5 Mon Sep 17 00:00:00 2001 From: oni-link Date: Sat, 12 Jul 2014 11:41:48 +0200 Subject: [PATCH] Add more commented patch numbers to version.c (3) #940 This should help reduce conflicts when merging patches from upstream. --- src/nvim/version.c | 48 ++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 48 insertions(+) diff --git a/src/nvim/version.c b/src/nvim/version.c index 9824b34d52..183e643753 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -202,6 +202,54 @@ static char *(features[]) = { static int included_patches[] = { // Add new patch number below this line + //364, + //363, + //362, + //361, + //360, + //359, + //358, + //357, + //356, + //355, + //354, + //353, + //352, + //351, + //350, + //349, + //348, + //347, + //346, + //345, + //344, + //343, + //342, + //341, + //340, + //339, + //338, + //337, + //336, + //335, + //334, + //333, + //332, + //331, + //330, + //329, + //328, + //327, + //326, + //325, + //324, + //323, + //322, + //321, + //320, + //319, + //318, + //317, //316, //315, //314,