commit | ece74ab103eca15e17435efbe9cb21039787f1ea | [log] [tgz] |
---|---|---|
author | Bram Moolenaar <Bram@vim.org> | Mon Jun 13 22:22:15 2016 +0200 |
committer | Bram Moolenaar <Bram@vim.org> | Mon Jun 13 22:22:15 2016 +0200 |
tree | 2f7da47b2ab351dce720f152a6ad609a7820ad40 | |
parent | a641e1d4da3f9152c489318c06a93fcd1c746637 [diff] [blame] |
patch 7.4.1932 Problem: When writing viminfo the jumplist is not merged with the one in the viminfo file. Solution: Merge based on timestamp.
diff --git a/src/version.c b/src/version.c index 977cb1a..b06ede3 100644 --- a/src/version.c +++ b/src/version.c
@@ -754,6 +754,8 @@ static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1932, +/**/ 1931, /**/ 1930,