aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/diff.txt
Commit message (Collapse)AuthorAge
* vim-patch:7.4.2251Shougo Matsushita2016-11-16
| | | | | | | Problem: In rare cases diffing 4 buffers is not enough. Solution: Raise the limit to 8. (closes vim/vim#1000) https://github.com/vim/vim/commit/015efc32c1add6269099364835ddf85ff257b3c6
* vim-patch:b4ff518KillTheMule2016-05-03
| | | | | | | | | | Updated runtime files. https://github.com/vim/vim/commit/b4ff518d95aa57c2f8c0568c915035bef849581b Missing files: runtime/doc/tags, runtime/doc/todo.txt. Changes to runtime/doc/if_pyth.txt, runtime/doc/options.txt and runtime/doc/quickref.txt did not aply. Excluded runtime/syntax/vim.vim.
* vim-patch:86ae720watiko2016-03-29
| | | | | | Updated runtime files. https://github.com/vim/vim/commit/86ae720d7567fcbbe40f00cf136c797953f21038
* vim-patch:0122c40Justin M. Keyes2015-12-17
| | | | | | Update runtime files. https://github.com/vim/vim/commit/0122c4070f84e71f15a39fb20ababeffb70757c4
* documentation: Update documentationZyX2015-10-23
| | | | | | | Note about ~/.local/share/nvim/site used in one usr_\* file: this one talks about user-local installation of third-party plugins, and ~/.local/share/nvim/site is the proper place for them. Most other files talk about user own configuration and this is ~/.config.
* Update vimrc_example fileFelipe Morales2015-06-29
| | | | | Because of recent work on defaults (see https://github.com/neovim/neovim/issues/2676)
* vim-patch:4abac79 #2694Florian Walch2015-05-19
| | | | | | Update runtime files. https://code.google.com/p/vim/source/detail?r=4abac79c0b7ae7aac0cb32d9930e155de628b63f
* doc: diff-mode: minor adjustmentsJustin M. Keyes2015-02-03
|
* Remove vimdiff: Review suggestionsMichael Reed2015-02-03
|
* Remove vimdiffMichael Reed2015-02-03
| | | | | | | While we're here: - Remove references to the '+diff' feature, which has since been made non-optional. - Update a few Vim instances with Nvim.
* re-integrate runtime/ vim-patch:0 #938Justin M. Keyes2014-07-29
Vim runtime files based on 7.4.384 / hg changeset 7090d7f160f7 Excluding: Amiga icons (*.info, icons/) doc/hangulin.txt tutor/ spell/ lang/ (only used for menu translations) macros/maze/, macros/hanoi/, macros/life/, macros/urm/ These were used to test vi compatibility. termcap "Demonstration of a termcap file (for the Amiga and Archimedes)" Helped-by: Rich Wareham <rjw57@cam.ac.uk> Helped-by: John <john.schmidt.h@gmail.com> Helped-by: Yann <yann@yann-salaun.com> Helped-by: Christophe Badoit <c.badoit@lesiteimmo.com> Helped-by: drasill <github@tof2k.com> Helped-by: Tae Sandoval Murgan <taecilla@gmail.com> Helped-by: Lowe Thiderman <lowe.thiderman@gmail.com>