commit https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd Author: Bram Moolenaar <Bram@vim.org> Date: Wed Jan 20 22:48:02 2016 +0100 patch 7.4.1147 Problem: Conflict for "chartab". (Kazunobu Kuriyama) Solution: Rename the global one to something less obvious. Move it into src/chartab.c.

--- a/src/version.c
+++ b/src/version.c
@@ -742,6 +742,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1147,
+/**/
     1146,
 /**/
     1145,