From a96fa9e5c2f255a938bd15373344a16448b255c7 Mon Sep 17 00:00:00 2001 From: mitchell <70453897+667e-11@users.noreply.github.com> Date: Sat, 27 Jun 2020 10:18:29 -0400 Subject: Updated file_diff test. --- test/test.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test') 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') -- cgit v1.2.3