aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/version.c
diff options
context:
space:
mode:
authorJames McCoy <jamessan@jamessan.com>2017-01-02 14:09:48 -0500
committerJames McCoy <jamessan@jamessan.com>2017-01-09 20:23:41 -0500
commit492f2cfeff9a8ed295d2cbf3f4197a91654e07ca (patch)
treeade9f538d71baa31f1637a43101ffc46be350e63 /src/nvim/version.c
parent282109c51b557bbd5d4fafb3f543613748831040 (diff)
downloadrneovim-492f2cfeff9a8ed295d2cbf3f4197a91654e07ca.tar.gz
rneovim-492f2cfeff9a8ed295d2cbf3f4197a91654e07ca.tar.bz2
rneovim-492f2cfeff9a8ed295d2cbf3f4197a91654e07ca.zip
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
Diffstat (limited to 'src/nvim/version.c')
-rw-r--r--src/nvim/version.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/nvim/version.c b/src/nvim/version.c
index 359255caee..30371b2d02 100644
--- a/src/nvim/version.c
+++ b/src/nvim/version.c
@@ -515,7 +515,7 @@ static int included_patches[] = {
1928,
// 1927 NA
// 1926 NA
- // 1925 NA
+ 1925,
// 1924 NA
1923,
// 1922 NA