vim-patch:7.4.682

Problem: The search highlighting and match highlighting replaces the
cursorline highlighting, this doesn't look good.
Solution: Combine the highlighting. (Yasuhiro Matsumoto)

09deeb7c94

src/nvim/version.c

@@ -311,7 +311,7 @@ static int included_patches[] = {
   // 685,
   // 684,
   // 683 NA
-  // 682,
+  682,
   // 681 NA
   // 680,
   // 679 NA