aboutsummaryrefslogtreecommitdiff
path: root/test/functional/legacy/029_join_spec.lua
diff options
context:
space:
mode:
authorckelsel <ckelsel@hotmail.com>2017-09-27 19:34:19 +0800
committerckelsel <ckelsel@hotmail.com>2017-09-27 19:34:19 +0800
commitc3de878ab1c3d1001660c3b3d6ce39fbc4fcd03c (patch)
treecf606878176f67bb5dcbf480d47d7ea9e0f4d1bf /test/functional/legacy/029_join_spec.lua
parent90fc9039ddcadc61d4236bdd2d638d690081e04d (diff)
parent542ed5f5d31647bfec6d3119f4e2993544530c35 (diff)
downloadrneovim-c3de878ab1c3d1001660c3b3d6ce39fbc4fcd03c.tar.gz
rneovim-c3de878ab1c3d1001660c3b3d6ce39fbc4fcd03c.tar.bz2
rneovim-c3de878ab1c3d1001660c3b3d6ce39fbc4fcd03c.zip
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'test/functional/legacy/029_join_spec.lua')
-rw-r--r--test/functional/legacy/029_join_spec.lua2
1 files changed, 2 insertions, 0 deletions
diff --git a/test/functional/legacy/029_join_spec.lua b/test/functional/legacy/029_join_spec.lua
index 460b9291bf..b28f276a7c 100644
--- a/test/functional/legacy/029_join_spec.lua
+++ b/test/functional/legacy/029_join_spec.lua
@@ -11,6 +11,8 @@ local feed_command = helpers.feed_command
describe('joining lines', function()
before_each(clear)
+ -- luacheck: ignore 613 (Trailing whitespaces in a string)
+ -- luacheck: ignore 611 (Line contains only whitespaces)
it("keeps marks with different 'joinspaces' settings", function()
insert([[
firstline