diff options
Diffstat (limited to 'runtime/doc/vim_diff.txt')
| -rw-r--r-- | runtime/doc/vim_diff.txt | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index d5ff27d8c5..3b3f257351 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -99,16 +99,22 @@ Additional differences: - |shada-c| has no effect. - |shada-s| now limits size of every item and not just registers. -- When reading ShaDa files history, jump list and change list items are merged - with those in currently running NeoVim instance according to the timestamp. +- When reading ShaDa files items are merged according to the timestamp. + |shada-merging| - 'viminfo' option got renamed to 'shada'. Old option is kept as an alias for compatibility reasons. -- |:wviminfo| was renamed to |:wshada|, |:rviminfo| to |:rshada|. Old commands - are still kept. -- When writing (|:wshada| without bang or at exit) it merges much more data. - Vim merges only marks. +- |:wviminfo| was renamed to |:wshada|, |:rviminfo| to |:rshada|. Old + commands are still kept. +- When writing (|:wshada| without bang or at exit) it merges much more data, + and does this according to the timestamp. Vim merges only marks. + |shada-merging| - ShaDa file format was designed with forward and backward compatibility in mind. |shada-compatibility| +- Some errors make ShaDa code keep temporary file in-place for user to decide + what to do with it. Vim deletes temporary file in these cases. + |shada-error-handling| +- Vim keeps no timestamps at all, neither in viminfo file nor in the instance + itself. ============================================================================== 4. New Features *nvim-features-new* |