patch 7.4.1925
Problem:    Viminfo does not merge file marks properly.
Solution:   Use a timestamp.  Add the :clearjumps command.
diff --git a/src/structs.h b/src/structs.h
index ac99e91..6075ee2 100644
--- a/src/structs.h
+++ b/src/structs.h
@@ -84,7 +84,7 @@
 # ifdef FEAT_XCLIPBOARD
 #  include <X11/Intrinsic.h>
 # endif
-# define guicolor_T long_u		/* avoid error in prototypes and 
+# define guicolor_T long_u		/* avoid error in prototypes and
 					 * make FEAT_TERMGUICOLORS work */
 # define INVALCOLOR ((guicolor_T)0x1ffffff)
 #endif
@@ -112,6 +112,9 @@
 {
     fmark_T	fmark;
     char_u	*fname;		/* file name, used when fnum == 0 */
+#ifdef FEAT_VIMINFO
+    time_t	time_set;
+#endif
 } xfmark_T;
 
 /*