From 5e7a7fc2da682f62648034920020c9da6366ef4d Mon Sep 17 00:00:00 2001
From: ZyX <kp-pav@yandex.ru>
Date: Sat, 18 Jul 2015 21:58:44 +0300
Subject: documentation: Document how ShaDa entries should be merged

---
 runtime/doc/vim_diff.txt | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'runtime/doc/vim_diff.txt')

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*
-- 
cgit