diff options
| author | ZyX <kp-pav@yandex.ru> | 2015-07-18 21:58:44 +0300 |
|---|---|---|
| committer | ZyX <kp-pav@yandex.ru> | 2015-10-08 22:00:12 +0300 |
| commit | 5e7a7fc2da682f62648034920020c9da6366ef4d (patch) | |
| tree | bf5a89f39cfee1ec4a228df992d42258bf762977 /runtime/doc/vim_diff.txt | |
| parent | f10960869f2c33812f00083e9584dc8ca16738f2 (diff) | |
| download | rneovim-5e7a7fc2da682f62648034920020c9da6366ef4d.tar.gz rneovim-5e7a7fc2da682f62648034920020c9da6366ef4d.tar.bz2 rneovim-5e7a7fc2da682f62648034920020c9da6366ef4d.zip | |
documentation: Document how ShaDa entries should be merged
Diffstat (limited to 'runtime/doc/vim_diff.txt')
| -rw-r--r-- | runtime/doc/vim_diff.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt index f93175cccf..94996477ab 100644 --- a/runtime/doc/vim_diff.txt +++ b/runtime/doc/vim_diff.txt @@ -105,6 +105,8 @@ Additional differences: 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. ============================================================================== 4. New Features *nvim-features-new* |