From 492f2cfeff9a8ed295d2cbf3f4197a91654e07ca Mon Sep 17 00:00:00 2001
From: James McCoy <jamessan@jamessan.com>
Date: Mon, 2 Jan 2017 14:09:48 -0500
Subject: vim-patch:7.4.1925

Problem:    Viminfo does not merge file marks properly.
Solution:   Use a timestamp.  Add the :clearjumps command.

https://github.com/vim/vim/commit/2d35899721da0e9359a9fe1059554f8c4ea7f0c1
---
 src/nvim/ex_cmds.lua | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'src/nvim/ex_cmds.lua')

diff --git a/src/nvim/ex_cmds.lua b/src/nvim/ex_cmds.lua
index b998b81284..88095602ba 100644
--- a/src/nvim/ex_cmds.lua
+++ b/src/nvim/ex_cmds.lua
@@ -479,6 +479,12 @@ return {
     addr_type=ADDR_WINDOWS,
     func='ex_close',
   },
+  {
+    command='clearjumps',
+    flags=bit.bor(TRLBAR, CMDWIN),
+    addr_type=ADDR_LINES,
+    func='ex_clearjumps',
+  },
   {
     command='cmap',
     flags=bit.bor(EXTRA, TRLBAR, NOTRLCOM, USECTRLV, CMDWIN),
-- 
cgit