commit 93268054428fe3a6bbe3f89d2def2fec4eabcf5f
author Bram Moolenaar <Bram@vim.org> Thu Oct 10 13:22:54 2019 +0200
committer Bram Moolenaar <Bram@vim.org> Thu Oct 10 13:22:54 2019 +0200
tree d8e0be653481f2f7010d3218e1e0181801aaeefc
parent 14c01f83487d5c53192297a710eda2b8a4ab17c9

patch 8.1.2128: renamed libvterm sources makes merging difficult

Problem:    Renamed libvterm sources makes merging difficult.
Solution:   Rename back to the original name and only rename the .o files.
            Also clean the libvterm build artifacts. (James McCoy,
            closes #5027)

src/version.c

diff --git a/src/version.c b/src/version.c
index 06454ef..7ad0acd 100644
--- a/src/version.c
+++ b/src/version.c
@@ -754,6 +754,8 @@
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    2128,
+/**/
     2127,
 /**/
     2126,