summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/testdir/test_shortpathname.vim1
-rw-r--r--src/version.c2
2 files changed, 3 insertions, 0 deletions
diff --git a/src/testdir/test_shortpathname.vim b/src/testdir/test_shortpathname.vim
index 59646308e9..59361ca281 100644
--- a/src/testdir/test_shortpathname.vim
+++ b/src/testdir/test_shortpathname.vim
@@ -78,6 +78,7 @@ func Test_ColonEight()
endfunc
func Test_ColonEight_MultiByte()
+ let g:test_is_flaky = 1
let dir = 'Xtest'
let file = dir . '/日本語のファイル.txt'
diff --git a/src/version.c b/src/version.c
index e805e2c542..50a34c8c79 100644
--- a/src/version.c
+++ b/src/version.c
@@ -705,6 +705,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 470,
+/**/
469,
/**/
468,