vim-patch:8.1.2264: there are two test files for :let

Problem:    There are two test files for :let.
Solution:   Merge the two files.
https://github.com/vim/vim/commit/fcf8a8743bdecc0ba28037b79b7cb2962de70b1d

N/A patches for version.c:

vim-patch:8.2.0617: new error check triggers in Swedish menu

Problem:    New error check triggers in Swedish menu.
Solution:   Insert backslash. (Mats Tegner, closes vim/vim#5966)
https://github.com/vim/vim/commit/d2662ad2de40e68999198150024531c91fece16c

vim-patch:8.2.0620: error in menu translations

Problem:    Error in menu translations.
Solution:   Insert a backslash before a space.
https://github.com/vim/vim/commit/0d6fe631f75effbfca92a4f61bbc2fab7385af09

vim-patch:8.2.0628: error in menu translations

Problem:    Error in menu translations.
Solution:   Insert a backslash before a space in one more file. (Shun Bai,
            Emir Sari)
https://github.com/vim/vim/commit/e71ebb46a252cd1cdfb075e6014c2b13c580bf3f

3 files changed, 53 insertions, 56 deletions

diff --git a/src/nvim/testdir/test_alot.vim b/src/nvim/testdir/test_alot.vim
index 7647475427..4f056abdc0 100644
--- a/src/nvim/testdir/test_alot.vim
+++ b/src/nvim/testdir/test_alot.vim
@@ -1,7 +1,6 @@
 " A series of tests that can run in one Vim invocation.
 " This makes testing go faster, since Vim doesn't need to restart.
 
-source test_assign.vim
 source test_backup.vim
 source test_behave.vim
 source test_cd.vim
diff --git a/src/nvim/testdir/test_assign.vim b/src/nvim/testdir/test_assign.vim
deleted file mode 100644
index 542b8469b7..0000000000
--- a/src/nvim/testdir/test_assign.vim
+++ /dev/null
@@ -1,55 +0,0 @@
-" Test for assignment
-
-func Test_no_type_checking()
-  let v = 1
-  let v = [1,2,3]
-  let v = {'a': 1, 'b': 2}
-  let v = 3.4
-  let v = 'hello'
-endfunc
-
-func Test_let_termcap()
-  " Nvim does not support `:set termcap`.
-  return
-  " Terminal code
-  let old_t_te = &t_te
-  let &t_te = "\<Esc>[yes;"
-  call assert_match('t_te.*^[[yes;', execute("set termcap"))
-  let &t_te = old_t_te
-
-  if exists("+t_k1")
-    " Key code
-    let old_t_k1 = &t_k1
-    let &t_k1 = "that"
-    call assert_match('t_k1.*that', execute("set termcap"))
-    let &t_k1 = old_t_k1
-  endif
-
-  call assert_fails('let x = &t_xx', 'E113')
-  let &t_xx = "yes"
-  call assert_equal("yes", &t_xx)
-  let &t_xx = ""
-  call assert_fails('let x = &t_xx', 'E113')
-endfunc
-
-func Test_let_option_error()
-  let _w = &tw
-  let &tw = 80
-  call assert_fails('let &tw .= 1', 'E734')
-  call assert_equal(80, &tw)
-  let &tw = _w
-
-  let _w = &fillchars
-  let &fillchars = "vert:|"
-  call assert_fails('let &fillchars += "diff:-"', 'E734')
-  call assert_equal("vert:|", &fillchars)
-  let &fillchars = _w
-endfunc
-
-func Test_let_errors()
-  let s = 'abcd'
-  call assert_fails('let s[1] = 5', 'E689:')
-
-  let l = [1, 2, 3]
-  call assert_fails('let l[:] = 5', 'E709:')
-endfunc
diff --git a/src/nvim/testdir/test_let.vim b/src/nvim/testdir/test_let.vim
index 0b9331ee38..a5cbd8f6a6 100644
--- a/src/nvim/testdir/test_let.vim
+++ b/src/nvim/testdir/test_let.vim
@@ -150,6 +150,59 @@ func Test_let_utf8_environment()
   call assert_equal('ĀĒĪŌŪあいうえお', $a)
 endfunc
 
+func Test_let_no_type_checking()
+  let v = 1
+  let v = [1,2,3]
+  let v = {'a': 1, 'b': 2}
+  let v = 3.4
+  let v = 'hello'
+endfunc
+
+func Test_let_termcap()
+  throw 'skipped: Nvim does not support termcap option'
+  " Terminal code
+  let old_t_te = &t_te
+  let &t_te = "\<Esc>[yes;"
+  call assert_match('t_te.*^[[yes;', execute("set termcap"))
+  let &t_te = old_t_te
+
+  if exists("+t_k1")
+    " Key code
+    let old_t_k1 = &t_k1
+    let &t_k1 = "that"
+    call assert_match('t_k1.*that', execute("set termcap"))
+    let &t_k1 = old_t_k1
+  endif
+
+  call assert_fails('let x = &t_xx', 'E113')
+  let &t_xx = "yes"
+  call assert_equal("yes", &t_xx)
+  let &t_xx = ""
+  call assert_fails('let x = &t_xx', 'E113')
+endfunc
+
+func Test_let_option_error()
+  let _w = &tw
+  let &tw = 80
+  call assert_fails('let &tw .= 1', 'E734')
+  call assert_equal(80, &tw)
+  let &tw = _w
+
+  let _w = &fillchars
+  let &fillchars = "vert:|"
+  call assert_fails('let &fillchars += "diff:-"', 'E734')
+  call assert_equal("vert:|", &fillchars)
+  let &fillchars = _w
+endfunc
+
+func Test_let_errors()
+  let s = 'abcd'
+  call assert_fails('let s[1] = 5', 'E689:')
+
+  let l = [1, 2, 3]
+  call assert_fails('let l[:] = 5', 'E709:')
+endfunc
+
 func Test_let_heredoc_fails()
   call assert_fails('let v =<< marker', 'E991:')