diff options
| author | prollings <patrickrollings@gmail.com> | 2016-07-11 07:05:06 +1000 |
|---|---|---|
| committer | Justin M. Keyes <justinkz@gmail.com> | 2016-07-10 17:05:06 -0400 |
| commit | dcbd1c7b13e98766754c4e75d3bb59021248217e (patch) | |
| tree | 1224f777f931c26a5ff2445d372b6fe6f86c768b /src/nvim/version.c | |
| parent | 29060a592c4c8ca4482a44b957a7bc332aed78e2 (diff) | |
| download | rneovim-dcbd1c7b13e98766754c4e75d3bb59021248217e.tar.gz rneovim-dcbd1c7b13e98766754c4e75d3bb59021248217e.tar.bz2 rneovim-dcbd1c7b13e98766754c4e75d3bb59021248217e.zip | |
vim-patch:7.4.1147 (#5005)
Problem: Conflict for "chartab". (Kazunobu Kuriyama)
Solution: Rename the global one to something less obvious. Move it into
src/chartab.c.
https://github.com/vim/vim/commit/88e8f9f14434a7cd538d0c159dc432bea869a5bd
Diffstat (limited to 'src/nvim/version.c')
| -rw-r--r-- | src/nvim/version.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c index 53551d81cf..966e4f9b4f 100644 --- a/src/nvim/version.c +++ b/src/nvim/version.c @@ -552,7 +552,7 @@ static int included_patches[] = { 1150, 1149, // 1148 NA - // 1147, + 1147, // 1146 NA // 1145 NA 1144, |