aboutsummaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authormitchell <70453897+667e-11@users.noreply.github.com>2020-06-27 10:18:29 -0400
committermitchell <70453897+667e-11@users.noreply.github.com>2020-06-27 10:18:29 -0400
commita96fa9e5c2f255a938bd15373344a16448b255c7 (patch)
tree3427d5990722289c67c000350d583be3e5fcaabb /test
parent6b2fc69b5d370925fc003ebc890f423e568bf086 (diff)
downloadtextadept-a96fa9e5c2f255a938bd15373344a16448b255c7.tar.gz
textadept-a96fa9e5c2f255a938bd15373344a16448b255c7.zip
Updated file_diff test.
Diffstat (limited to 'test')
-rw-r--r--test/test.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/test.lua b/test/test.lua
index 5a35b0de..4121c8ca 100644
--- a/test/test.lua
+++ b/test/test.lua
@@ -3351,8 +3351,8 @@ function test_file_diff()
['d'] = diff.INDIC_ADDITION
}, {[15] = ' '})
- -- Go to next difference, merge third block from right to left, and verify.
- diff.goto_change(true)
+ -- Already on next difference; merge third block from right to left, and
+ -- verify.
assert_equal(buffer1:line_from_position(buffer1.current_pos), 12)
diff.merge(true)
assert(buffer1:get_line(12):find('into four'), 'did not merge from right to left')