vim-patch:7.4.1925

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

2d35899721

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