annotate src/testdir/test52.ok @ 14972:5d52b21b2e7f v8.1.0497

patch 8.1.0497: :%diffput changes order of lines commit https://github.com/vim/vim/commit/5f57bdcab77bc417ae0357fe8ad6c7259b6d25df Author: Bram Moolenaar <Bram@vim.org> Date: Thu Oct 25 17:52:23 2018 +0200 patch 8.1.0497: :%diffput changes order of lines Problem: :%diffput changes order of lines. (Markus Braun) Solution: Do adjust marks when using internal diff.
author Bram Moolenaar <Bram@vim.org>
date Thu, 25 Oct 2018 18:00:07 +0200
parents 3fc0f57ecb91
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
7
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
1 1 utf-8 text: Для Vim version 6.2. Последнее изменение: 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
2 1 utf-8 text: Vim version 6.2. : 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
3 1 utf-8 text: Vim version 6.2. ᫥ : 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
4 2 cp1251 text: Для Vim version 6.2. Последнее изменение: 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
5 2 cp1251 text: Vim version 6.2. : 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
6 2 cp1251 text: Vim version 6.2. ᫥ : 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
7 3 cp866 text: Для Vim version 6.2. Последнее изменение: 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
8 3 cp866 text: Vim version 6.2. : 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
9 3 cp866 text: Vim version 6.2. ᫥ : 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
10 1 utf-8 text: Для Vim version 6.2. Последнее изменение: 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
11 2 cp1251 text: Для Vim version 6.2. Последнее изменение: 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
12 3 cp866 text: Для Vim version 6.2. Последнее изменение: 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
13 1 utf-8 text: Vim version 6.2. : 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
14 2 cp1251 text: Vim version 6.2. : 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
15 3 cp866 text: Vim version 6.2. : 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
16 1 utf-8 text: Vim version 6.2. ᫥ : 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
17 2 cp1251 text: Vim version 6.2. ᫥ : 1970 Jan 01
3fc0f57ecb91 updated for version 7.0001
vimboss
parents:
diff changeset
18 3 cp866 text: Vim version 6.2. ᫥ : 1970 Jan 01