aboutsummaryrefslogtreecommitdiff
path: root/src/nvim/testdir/test_lambda.vim
diff options
context:
space:
mode:
Diffstat (limited to 'src/nvim/testdir/test_lambda.vim')
-rw-r--r--src/nvim/testdir/test_lambda.vim2
1 files changed, 2 insertions, 0 deletions
diff --git a/src/nvim/testdir/test_lambda.vim b/src/nvim/testdir/test_lambda.vim
index d51b6f7c5a..43483841ac 100644
--- a/src/nvim/testdir/test_lambda.vim
+++ b/src/nvim/testdir/test_lambda.vim
@@ -284,3 +284,5 @@ func Test_named_function_closure()
call garbagecollect()
call assert_equal(14, s:Abar())
endfunc
+=======
+>>>>>>> 381a8796... vim-patch:7.4.2044