~neovim-ppa/neovim-ppa/neovim

Viewing all changes in revision 2643.

  • Committer: Justin M. Keyes
  • Author(s): prollings
  • Date: 2016-07-10 21:05:06 UTC
  • Revision ID: git-v1:dcbd1c7b13e98766754c4e75d3bb59021248217e
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

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: