Mercurial > vim
annotate src/testdir/dumps/Test_diff_12.dump @ 26815:421d082c8f09 v8.2.3936
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 |
rev | line source |
---|---|
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
1 |++0#0000e05#a8a8a8255| |+|-@1| |1|0| |l|i|n|e|s|:| |1|-@19||+1#0000000#ffffff0|++0#0000e05#a8a8a8255| |+|-@1| |1|0| |l|i|n|e|s|:| |1|-@19 |
16135
dc0801e374e0
patch 8.1.1072: extending sign and foldcolumn below the text is confusing
Bram Moolenaar <Bram@vim.org>
parents:
14696
diff
changeset
|
2 |~+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:
14696
diff
changeset
|
3 |~| @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:
14696
diff
changeset
|
4 |~| @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:
14696
diff
changeset
|
5 |~| @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:
14696
diff
changeset
|
6 |~| @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:
14696
diff
changeset
|
7 |~| @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:
14696
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:
14696
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:
14696
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:
14696
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:
14696
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:
14696
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:
14696
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:
14696
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:
14696
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:
14696
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:
14696
diff
changeset
|
18 |~| @35||+1#0000000&|~+0#4040ff13&| @35 |
14696
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
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 |
195e8b1fcbbf
patch 8.1.0360: using an external diff program is slow and inflexible
Christian Brabandt <cb@256bit.org>
parents:
diff
changeset
|
20 |:+0&&> @73 |