annotate src/testdir/dumps/Test_diff_cuc_04.dump @ 24599:8eda31c9b9e2

Added tag v8.2.2838 for changeset 6b85c09a4d73669457a997eac9a0364970f1e3d5
author Bram Moolenaar <Bram@vim.org>
date Thu, 06 May 2021 18:00:04 +0200
parents b27601c0d289
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
22818
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
1 |a+0&#ffffff0|a+0&#e0e0e08| +0&#ffffff0@34||+1&&| +0#0000e05#a8a8a8255@1|a+0#0000000#ffffff0@1| @32
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
2 |-+0#4040ff13#afffff255@36||+1#0000000#ffffff0| +0#0000e05#a8a8a8255@1|b+0#0000000#5fd7ff255@1| @32
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
3 |c+0&#ffffff0>c| @34||+1&&| +0#0000e05#a8a8a8255@1|c+0#0000000#ffffff0@1| @32
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
4 |~+0#4040ff13&| @35||+1#0000000&|~+0#4040ff13&| @35
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
5 |~| @35||+1#0000000&|~+0#4040ff13&| @35
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
6 |~| @35||+1#0000000&|~+0#4040ff13&| @35
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
7 |~| @35||+1#0000000&|~+0#4040ff13&| @35
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
8 |~| @35||+1#0000000&|~+0#4040ff13&| @35
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
9 |~| @35||+1#0000000&|~+0#4040ff13&| @35
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
10 |~| @35||+1#0000000&|~+0#4040ff13&| @35
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
11 |~| @35||+1#0000000&|~+0#4040ff13&| @35
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
12 |~| @35||+1#0000000&|~+0#4040ff13&| @35
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
13 |~| @35||+1#0000000&|~+0#4040ff13&| @35
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
14 |~| @35||+1#0000000&|~+0#4040ff13&| @35
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
15 |~| @35||+1#0000000&|~+0#4040ff13&| @35
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
16 |~| @35||+1#0000000&|~+0#4040ff13&| @35
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
17 |~| @35||+1#0000000&|~+0#4040ff13&| @35
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
18 |~| @35||+1#0000000&|~+0#4040ff13&| @35
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
19 |[+3#0000000&|N|o| |N|a|m|e|]| |[|+|]| @5|2|,|2| @11|A|l@1| |[+1&&|N|o| |N|a|m|e|]| |[|+|]| @5|3|,|2| @11|A|l@1
b27601c0d289 patch 8.2.1957: diff and cursorcolumn highlighting don't mix
Bram Moolenaar <Bram@vim.org>
parents:
diff changeset
20 | +0&&@74