Mercurial > vim

annotate src/testdir/dumps/Test_diff_17.dump @ 26815:421d082c8f09 v8.2.3936

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.2.3936: no proper test for maintaining change mark in diff mode Commit: https://github.com/vim/vim/commit/ccc1644f95e7833c23fa0d440e42293c1622fdcb Author: Sean Dewar <seandewar@users.noreply.github.com> Date: Wed Dec 29 16:44:48 2021 +0000 patch 8.2.3936: no proper test for maintaining change mark in diff mode Problem: No proper test for maintaining change mark in diff mode. Solution: Run the test with internal and external diff. (Sean Dewar, closes #9424)
author Bram Moolenaar <Bram@vim.org>
date Wed, 29 Dec 2021 17:45:02 +0100
parents dc0801e374e0
children 98f5a0618a77
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
14762
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
1 | +0#0000e05#a8a8a8255@1|a+0#0000000#ffffff0| @33||+1&&| +0#0000e05#a8a8a8255@1|a+0#0000000#ffffff0| @33
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
2 | +0#0000e05#a8a8a8255@1| +0#0000000#5fd7ff255@34||+1&#ffffff0| +0#0000e05#a8a8a8255@1|-+0#4040ff13#afffff255@34
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
3 | +0#0000e05#a8a8a8255@1|c+0#0000000#ffffff0|d| @32||+1&&| +0#0000e05#a8a8a8255@1|c+0#0000000#ffffff0|d| @32
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
4 | +0#0000e05#a8a8a8255@1|e+0#0000000#ffffff0|f| @32||+1&&| +0#0000e05#a8a8a8255@1| +0#0000000#ffffff0@34
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
5 | +0#0000e05#a8a8a8255@1|x+2#0000000#ff404010@2| +0&#ffd7ff255@31||+1&#ffffff0| +0#0000e05#a8a8a8255@1|e+0#0000000#ffffff0|f| @32
16135
dc0801e374e0 patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents: 14762
diff changeset
6 |~+0#4040ff13&| @35||+1#0000000&| +0#0000e05#a8a8a8255@1|y+2#0000000#ff404010@2| +0&#ffd7ff255@31
dc0801e374e0 patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents: 14762
diff changeset
7 |~+0#4040ff13#ffffff0| @35||+1#0000000&|~+0#4040ff13&| @35
dc0801e374e0 patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents: 14762
diff changeset
8 |~| @35||+1#0000000&|~+0#4040ff13&| @35
dc0801e374e0 patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents: 14762
diff changeset
9 |~| @35||+1#0000000&|~+0#4040ff13&| @35
dc0801e374e0 patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents: 14762
diff changeset
10 |~| @35||+1#0000000&|~+0#4040ff13&| @35
dc0801e374e0 patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents: 14762
diff changeset
11 |~| @35||+1#0000000&|~+0#4040ff13&| @35
dc0801e374e0 patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents: 14762
diff changeset
12 |~| @35||+1#0000000&|~+0#4040ff13&| @35
dc0801e374e0 patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents: 14762
diff changeset
13 |~| @35||+1#0000000&|~+0#4040ff13&| @35
dc0801e374e0 patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents: 14762
diff changeset
14 |~| @35||+1#0000000&|~+0#4040ff13&| @35
dc0801e374e0 patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents: 14762
diff changeset
15 |~| @35||+1#0000000&|~+0#4040ff13&| @35
dc0801e374e0 patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents: 14762
diff changeset
16 |~| @35||+1#0000000&|~+0#4040ff13&| @35
dc0801e374e0 patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents: 14762
diff changeset
17 |~| @35||+1#0000000&|~+0#4040ff13&| @35
dc0801e374e0 patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents: 14762
diff changeset
18 |~| @35||+1#0000000&|~+0#4040ff13&| @35
14762
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
19 |X+3#0000000&|f|i|l|e|1| @12|1|,|1| @11|A|l@1| |X+1&&|f|i|l|e|2| @12|1|,|1| @11|A|l@1
b43ea03bb522 patch 8.1.0393: not all white space difference options available
Christian Brabandt <cb@256bit.org>
parents:
diff changeset
20 |:+0&&> @73