aboutsummaryrefslogtreecommitdiff
path: root/runtime/doc/vim_diff.txt
diff options
context:
space:
mode:
authorZyX <kp-pav@yandex.ru>2015-07-26 21:02:56 +0300
committerZyX <kp-pav@yandex.ru>2015-10-08 22:00:16 +0300
commitf8169ff24db20d9420eae0c6044da86fa09378a9 (patch)
treea27febfac23910c250db86cdeaf2fe86d05c16d3 /runtime/doc/vim_diff.txt
parent38b8eb35610f154ef6d90b0e9be693f832dda0a9 (diff)
downloadrneovim-f8169ff24db20d9420eae0c6044da86fa09378a9.tar.gz
rneovim-f8169ff24db20d9420eae0c6044da86fa09378a9.tar.bz2
rneovim-f8169ff24db20d9420eae0c6044da86fa09378a9.zip
documentation: Document ShaDa compatibility features
Diffstat (limited to 'runtime/doc/vim_diff.txt')
-rw-r--r--runtime/doc/vim_diff.txt2
1 files changed, 2 insertions, 0 deletions
diff --git a/runtime/doc/vim_diff.txt b/runtime/doc/vim_diff.txt
index 94996477ab..d5ff27d8c5 100644
--- a/runtime/doc/vim_diff.txt
+++ b/runtime/doc/vim_diff.txt
@@ -107,6 +107,8 @@ Additional differences:
are still kept.
- When writing (|:wshada| without bang or at exit) it merges much more data.
Vim merges only marks.
+- ShaDa file format was designed with forward and backward compatibility in
+ mind. |shada-compatibility|
==============================================================================
4. New Features *nvim-features-new*