Mercurial > vim

annotate src/testdir/dumps/Test_diff_cuc_03.dump @ 30847:2c03ff81cbcb v9.0.0758

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 9.0.0758: "precedes" from 'listchars' overwritten by <<< Commit: https://github.com/vim/vim/commit/13cdde39520220bb856cba16626327c706752b51 Author: Bram Moolenaar <Bram@vim.org> Date: Sat Oct 15 14:07:48 2022 +0100 patch 9.0.0758: "precedes" from 'listchars' overwritten by <<< Problem: "precedes" from 'listchars' overwritten by <<< for 'smoothscroll'. Solution: Keep the "precedes" character.
author Bram Moolenaar <Bram@vim.org>
date Sat, 15 Oct 2022 15:15:03 +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&#e0e0e08|a+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@1| @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|,|1| @11|A|l@1| |[+1&&|N|o| |N|a|m|e|]| |[|+|]| @5|3|,|1| @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