| commit | 2d35899721da0e9359a9fe1059554f8c4ea7f0c1 | [log] [tgz] |
|---|---|---|
| author | Bram Moolenaar <Bram@vim.org> | Sun Jun 12 21:20:54 2016 +0200 |
| committer | Bram Moolenaar <Bram@vim.org> | Sun Jun 12 21:20:54 2016 +0200 |
| tree | fcb24c8186d9b23277948cb097e1807830737781 | |
| parent | cf089463492fab53b2a5d81517829d22f882f82e [diff] [blame] |
patch 7.4.1925 Problem: Viminfo does not merge file marks properly. Solution: Use a timestamp. Add the :clearjumps command.
diff --git a/src/version.c b/src/version.c index 01b9c4f..9c821d4 100644 --- a/src/version.c +++ b/src/version.c
@@ -754,6 +754,8 @@ static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1925, +/**/ 1924, /**/ 1923,